delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix Backup::Manager#remove_old25399-backup-task-is-not-working-on-8-15-pre	Sean McGivern	2016-12-07	2	-9/+137
\|
*	Merge branch 'move-admin-hooks-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-12-07	4	-31/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Move admin hooks spinach to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7942
\| *	Move admin hooks spinach to rspec	Semyon Pupkov	2016-12-06	4	-31/+12
\| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \|	Merge branch 'move-admin-logs-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-12-07	4	-19/+19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin logs spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7945
\| * \|	Move admin logs spinach test to rspec	Semyon Pupkov	2016-12-06	4	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \|	Merge branch 'ux-guide-animation' into 'master'	Achilleas Pipinellis	2016-12-07	7	-22/+56
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Create animation page and clean up indexux-guide-animation	awhildy	2016-12-05	7	-22/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add guidance on timings and easing [ci skip] Detail when not to use easing Add dropdown and hover examples Add quick update animation
* \| \| \|	Merge branch '25209-improve-length-validators' into 'master'	Rémy Coutable	2016-12-07	18	-46/+89
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use :maximum instead of :within for length validators with a 0..N range Closes #25209 See merge request !7894
\| * \| \| \|	Use :maximum instead of :within for length validators with a 0..N range25209-improve-length-validators	Rémy Coutable	2016-12-06	18	-46/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'patch-7' into 'master'	Achilleas Pipinellis	2016-12-07	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update php.md - /.dockerinit was removed in v1.11 so the test always results in … See merge request !7882
\| * \| \| \| \|	Update php.md - /.dockerinit was removed in v1.11 so the test always results ↵	Sam Carrington	2016-12-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in an early exit https://github.com/docker/docker/pull/19490
* \| \| \| \| \|	Merge branch 'excoveralls_coverage' into 'master'	Rémy Coutable	2016-12-07	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add excoveralls in list of coverage examples See merge request !7906
\| * \| \| \| \| \|	Add excoveralls example	PotHix	2016-12-05	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There was no example for Elixir in gitlab-ci examples, this commit adds the missing example. excoveralls repository was pointing to an old example that doesn't exist anymore.
* \| \| \| \| \| \|	Merge branch 'patch-6' into 'master'	Sean McGivern	2016-12-07	1	-0/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update custom_hooks.md for chained hooks support See merge request !6721
\| * \| \| \| \| \| \|	Update custom_hooks.md for global custom hooks and chained hook info	Elan Ruusamäe	2016-12-06	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/93
* \| \| \| \| \| \| \|	Merge branch 'dz-fix-group-label-404' into 'master'	Rémy Coutable	2016-12-07	2	-11/+32
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 404 error when visit group label edit page Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25158 See merge request !7957
\| * \| \| \| \| \| \| \|	Fix 404 error when visit group label edit pagedz-fix-group-label-404	Dmitriy Zaporozhets	2016-12-06	2	-11/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'remove-has-visible-content-caching' into 'master'	Douwe Maan	2016-12-07	3	-42/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	Remove caching of Repository#has_visible_content?remove-has-visible-content-caching	Yorick Peterse	2016-12-06	3	-42/+7
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method already uses the cached method Repository#branch_count so there's no point in also caching has_visible_content?. Fixes gitlab-org/gitlab-ce#25278
* \| \| \| \| \| \| \| \|	Merge branch 'cleanup-7180' into 'master'	Robert Schilling	2016-12-06	1	-9/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	A simpler implementation of finding a merge request	Bob Van Landuyt	2016-12-06	1	-9/+6
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Following a discussion in !7180
* \| \| \| \| \| \| \| \|	Merge branch 'remove-pages-css' into 'master'	Jacob Schatz	2016-12-06	5	-35/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove more pages css * Moves award emojis to `/framework` * Moves generic image styles to `/framework` * Removes `confirmation.scss` See merge request !7952
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into 'remove-pages-css'remove-pages-css	Annabel Dunstone Gray	2016-12-06	19	-250/+192
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/stylesheets/framework.scss
\| * \| \| \| \| \| \| \| \| \|	Remove confirmation.scss	Annabel Dunstone Gray	2016-12-06	2	-35/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move award emojis to framwork	Annabel Dunstone Gray	2016-12-06	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move image styles to framework	Annabel Dunstone Gray	2016-12-06	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-dashboard-css' into 'master'	Jacob Schatz	2016-12-06	2	-49/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove dashboard.scss See merge request !7960
\| * \| \| \| \| \| \| \| \| \|	Remove dashboard.scss	Annabel Dunstone Gray	2016-12-06	2	-49/+0
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'remove-tags-scss' into 'master'	Jacob Schatz	2016-12-06	4	-57/+60
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove tags.scss Remove `tags.scss` See merge request !7935
\| * \| \| \| \| \| \| \| \| \|	Remove tags.scssremove-tags-scss	Annabel Dunstone Gray	2016-12-06	4	-57/+60
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'admin-scss' into 'master'	Jacob Schatz	2016-12-06	13	-193/+127
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove admin.scss Removes admin-specific CSS See merge request !7932
\| * \| \| \| \| \| \| \| \|	Remove admin.scssadmin-scss	Annabel Dunstone Gray	2016-12-05	11	-139/+99
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Truncate fix, remove unneeded admin-specific css	Annabel Dunstone Gray	2016-12-05	5	-54/+28
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-7' into 'master'	Sean McGivern	2016-12-06	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encourage bug reporters to mention if they use GitLab.com [ci skip] See merge request !7954
\| * \| \| \| \| \| \| \| \|	Encourage bug reporters to mention if they use GitLab.com [ci skip]	Adam Niedzielski	2016-12-06	1	-0/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'deleted-source-branch-comment' into 'master'	Sean McGivern	2016-12-06	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain "js: true" in "deleted_source_branch_spec.rb" See merge request !7949
\| * \| \| \| \| \| \| \|	Explain "js: true" in "deleted_source_branch_spec.rb" [ci skip]	Adam Niedzielski	2016-12-06	1	-0/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '23589-open-issue-for-mr' into 'master'	Sean McGivern	2016-12-06	28	-22/+670
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create an issue for all unresolved discussions in an MR See merge request !7180
\| * \| \| \| \| \| \| \| \|	Feature: delegate all open discussions to Issue	Bob Van Landuyt	2016-12-05	28	-22/+670
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a merge request can only be merged when all discussions are resolved. This feature allows to easily delegate those discussions to a new issue, while marking them as resolved in the merge request. The user is presented with a new issue, prepared with mentions of all unresolved discussions, including the first unresolved note of the discussion, time and link to the note. When the issue is created, the discussions in the merge request will get a system note directing the user to the newly created issue.
* \| \| \| \| \| \| \| \| \|	Merge branch '24733-archived-project-merge-request-count' into 'master'	Sean McGivern	2016-12-06	8	-9/+62
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Archived project merge requests add to group's Merge Requests Closes #24733 See merge request !7790
\| * \| \| \| \| \| \| \| \| \|	Fix Archived project merge requests add to group's Merge Requests	Jacopo	2016-12-05	8	-9/+62
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	counter This is done by: - Extending the IssuableFinder adding the non_archived option to the params - Overriding the #filter_params in the MergeRequestsAction - Passing the non_archived param in the nav/_group.html.haml navbar partial from the groups/merge_requests.html.haml
* \| \| \| \| \| \| \| \| \|	Merge branch 'zj-guest-reads-public-builds' into 'master'	Sean McGivern	2016-12-06	11	-12/+95
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guests can read builds if those are public See merge request !6842
\| * \| \| \| \| \| \| \| \|	Update effected testszj-guest-reads-public-builds	Z.J. van de Weg	2016-12-04	7	-47/+45
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Guests can read builds if those are public	Z.J. van de Weg	2016-12-04	7	-10/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #18448
* \| \| \| \| \| \| \| \| \|	Merge branch 'refine-ci-statuses' into 'master'	Kamil Trzciński	2016-12-06	29	-7/+698
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refine CI Statuses ## What does this MR do? This MR introduces classes for each relevant CI status. ## What are the relevant issue numbers? Closes #24273 See merge request !7889
\| * \| \| \| \| \| \| \| \| \|	Add text example for pipeline status without actionrefine-ci-statuses	Grzegorz Bizon	2016-12-06	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use detailed status as CSS class in pipelines list	Grzegorz Bizon	2016-12-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use status text when redering pipelines list	Grzegorz Bizon	2016-12-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Improve support for icons in new detailed statuses	Grzegorz Bizon	2016-12-06	3	-2/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add status label information to pipeline header	Grzegorz Bizon	2016-12-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|