- 07 Dec, 2016 15 commits
-
-
Grzegorz Bizon authored
* master: (114 commits) Remove dashboard.scss Update custom_hooks.md for global custom hooks and chained hook info Move admin hooks spinach to rspec Move admin logs spinach test to rspec Fix 404 error when visit group label edit page A simpler implementation of finding a merge request Encourage bug reporters to mention if they use GitLab.com Bump gitlab-shell version to 4.0.3 Remove confirmation.scss Explain "js: true" in "deleted_source_branch_spec.rb" Move award emojis to framwork Move image styles to framework Remove tags.scss Remove caching of Repository#has_visible_content? Add text example for pipeline status without action Use detailed status as CSS class in pipelines list Use status text when redering pipelines list Improve support for icons in new detailed statuses Add status label information to pipeline header Untangle status label and text in ci status helper ...
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Marin Jankovski authored
Bump Git version requirement to 2.8.4 Following gitlab-org/omnibus-gitlab!1108, the install doc and README should be updated too. See merge request !7878
-
Yorick Peterse authored
Bump gitlab-shell version to 4.0.3 See merge request !7953
-
Rémy Coutable authored
Move admin hooks spinach to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7942
-
Rémy Coutable authored
Move admin logs spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7945
-
Achilleas Pipinellis authored
UX Guide - add initial animation guidance Adding guidance to our UX Guide around animation. This is to help us implement #24831 and add polished, consistent animation throughout GitLab. See merge request !7780
-
Rémy Coutable authored
Use :maximum instead of :within for length validators with a 0..N range Closes #25209 See merge request !7894
-
Achilleas Pipinellis authored
Update php.md - /.dockerinit was removed in v1.11 so the test always results in … See merge request !7882
-
Rémy Coutable authored
Add excoveralls in list of coverage examples See merge request !7906
-
Sean McGivern authored
Update custom_hooks.md for chained hooks support See merge request !6721
-
Rémy Coutable authored
Fix 404 error when visit group label edit page Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25158 See merge request !7957
-
Regis authored
-
Douwe Maan authored
Remove caching of Repository#has_visible_content? This MR removes the caching of `Repository#has_visible_content?`. The cache for this method is no longer necessary and this should solve the problem described in https://gitlab.com/gitlab-org/gitlab-ce/issues/25278. See merge request !7947
-
- 06 Dec, 2016 25 commits
-
-
Robert Schilling authored
A simpler implementation of finding a merge request ## What does this MR do? This cleans up some code in the issues API as discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7180#note_19501743 The helper method `merge_request_for_resolving_discussions` was no longer needed as it was only used once. That made it possible to simplify the implementation. ## Does this MR meet the acceptance criteria? - [x] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added~~ - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? !7180 See merge request !7955
-
Jacob Schatz authored
Remove more pages css * Moves award emojis to `/framework` * Moves generic image styles to `/framework` * Removes `confirmation.scss` See merge request !7952
-
Jacob Schatz authored
Remove dashboard.scss See merge request !7960
-
Annabel Dunstone Gray authored
# Conflicts: # app/assets/stylesheets/framework.scss
-
Jacob Schatz authored
Remove tags.scss Remove `tags.scss` See merge request !7935
-
Jacob Schatz authored
Remove admin.scss Removes admin-specific CSS See merge request !7932
-
Regis authored
-
Annabel Dunstone Gray authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Bob Van Landuyt authored
Following a discussion in !7180
-
Sean McGivern authored
Encourage bug reporters to mention if they use GitLab.com [ci skip] See merge request !7954
-
Adam Niedzielski authored
-
Regis authored
-
Ruben Davila authored
-
Annabel Dunstone Gray authored
-
Sean McGivern authored
Explain "js: true" in "deleted_source_branch_spec.rb" See merge request !7949
-
Adam Niedzielski authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Sean McGivern authored
Create an issue for all unresolved discussions in an MR See merge request !7180
-
Sean McGivern authored
Fix Archived project merge requests add to group's Merge Requests Closes #24733 See merge request !7790
-