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

	Commit message (Collapse)	Author	Age	Files	Lines
*	added changelog entryremove-unnecessary-message-mr-commits-tab	Dimitrie Hoekstra	2016-12-15	1	-0/+4
\|
*	Remove unnecessary message	Victor Wu	2016-12-09	1	-4/+0
\|
*	Merge remote-tracking branch 'dev/master'	Robert Speicher	2016-12-09	8	-29/+18
\|\
\| *	Update CHANGELOG.md for 8.13.9	Alejandro Rodríguez	2016-12-08	1	-0/+5
\| \| \| \| \| \|	[ci skip]
\| *	Update CHANGELOG.md for 8.14.4	Alejandro Rodríguez	2016-12-08	8	-29/+13
\| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'dz-nested-groups' into 'master'	Douwe Maan	2016-12-09	26	-159/+402
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add nested groups support on data level ## What does this MR do? - [x] Add `parent_id` field to `Namespace`model. - [x] Create new database table `routes` that keeps information about full path to each group or project - [x] Remove uniq index from `namespaces.path` - [x] Add uniq index on `routes.path` - [x] Fill routes table with path data from namespaces and projects - [x] Change Namespace/Project URL lookup by routes table - [x] Rename related routes (nested groups, projects) when parent path changes This is solely backend preparation. UI, Permissions and API support will be added in separate merge request. ## Are there points in the code the reviewer needs to double check? migrations, Route model, Routable concern Will require downtime. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121#note_19490281 discussion ## Why was this MR needed? One step further to full nested groups support ## Screenshots (if relevant) No UI changes in this merge request so far ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added~~ - ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7121
\| * \|	Add nested groups support on data leveldz-nested-groups	Dmitriy Zaporozhets	2016-12-08	26	-159/+402
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add parent_id field to namespaces table to store relation with nested groups * create routes table to keep information about full path of every group and project * project/group lookup by full path from routes table Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'	Douwe Maan	2016-12-08	22	-60/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace MR access checks with use of MergeRequestsFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested - [x] :bomb: app/finders/notes_finder.rb:17 - [x] :warning: app/views/layouts/nav/_project.html.haml:80 [`.count`] - [x] :bomb: app/controllers/concerns/creates_commit.rb:84 - [x] :traffic_light: app/controllers/projects/commits_controller.rb:24 - [x] :traffic_light: app/controllers/projects/compare_controller.rb:56 - [x] :vertical_traffic_light: app/controllers/projects/discussions_controller.rb:29 - [x] :white_check_mark: app/controllers/projects/todos_controller.rb:27 - [x] :vertical_traffic_light: app/models/commit.rb:268 - [x] :white_check_mark: lib/gitlab/search_results.rb:71 - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_267_266 Memoize ` merged_merge_request(current_user)` - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_248_247 Expected side effect for `merged_merge_request!`, consider `skip_authorization: true`. - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_269_269 Scary use of unchecked `merged_merge_request?` See merge request !2033
* \| \|	Merge branch 'html-safe-diff-line-content' into 'security'	Robert Speicher	2016-12-08	3	-10/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't accidentally mark unsafe diff lines as HTML safe Fixes potential XSS issue when a legacy diff note is created on a merge request whose diff contained HTML See https://gitlab.com/gitlab-org/gitlab-ce/issues/25249 See merge request !2040
* \| \|	Merge branch 'rs-filter-authentication_token' into 'security'	Douwe Maan	2016-12-08	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add authentication_token to filter_parameters list See merge request !2041
* \| \|	Merge branch 'destroy-session' into 'security'	Robert Speicher	2016-12-08	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Destroy a user session when they delete their own account via browser This patch destroys a user's session when they delete their own account using a browser. A new session is created as they are redirected to the sign_in page. Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/25015 See merge request !2042
* \| \|	Merge branch 'fix-reset-template' into 'master'	Fatih Acet	2016-12-08	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix JS error when reseting new issue template Fixes JS error when trying to reset template when no template has been set. See merge request !7978
\| * \| \|	Do nothing if file is undefinedfix-reset-template	Alfredo Sumaran	2016-12-07	1	-0/+2
\| \| \| \|
* \| \| \|	Merge branch 'system-notes-fade' into 'master'	Fatih Acet	2016-12-08	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fade out should be white instead of gray Currently, you can see the hard edge of the fade out because it's a light shade of gray rather than white. Before: ![Screen_Shot_2016-12-07_at_12.36.10_PM](/uploads/c8fd2c6ba1742d1260614fd4c9cb29c9/Screen_Shot_2016-12-07_at_12.36.10_PM.png) After: ![Screen_Shot_2016-12-07_at_12.35.53_PM](/uploads/52b51e4a825658a0c440e0f1fb86a31c/Screen_Shot_2016-12-07_at_12.35.53_PM.png) cc @nmrony See merge request !7979
\| * \| \| \|	Fade out should be white instead of graysystem-notes-fade	Annabel Dunstone Gray	2016-12-07	1	-1/+1
\| \|/ / /
* \| \| \|	Merge branch 'small-emoji-adjustments' into 'master'	Fatih Acet	2016-12-08	4	-3/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Various small emoji positioning adjustments ## What does this MR do? It changes various emoticon related css rules with very small minor tweaks of 1 or 2 px ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? aesthetics ## Screenshots (if relevant) - ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? none See merge request !7993
\| * \| \| \|	Various small emoji positioning adjustmentssmall-emoji-adjustments	Dimitrie Hoekstra	2016-12-08	4	-3/+8
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'timeago-perf-fix' into 'master'	Fatih Acet	2016-12-08	2	-1/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed timeago re-rendering every element ## What does this MR do? Fixes an issue when new notes are added timeago will be initialised for every timeago element on the page again and therefore adding more timeouts. See merge request !7969
\| * \| \| \|	Fixed timeago re-rendering every elementtimeago-perf-fix	Phil Hughes	2016-12-07	2	-1/+7
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Fixes a performance regression that was causing timeago to get re-rendered on every element & therefore adding a lot of new setTimeouts
* \| \| \|	Merge branch 'pipeline-stage' into 'master'	Rémy Coutable	2016-12-08	33	-193/+497
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refine pipeline stages ## What does this MR do? Introduces a concept of `Ci::Stage` to make it easier to have detailed statuses. ## Why was this MR needed? This is needed to simplify the handling of `Ci::Statuses` and make the `Stage` actual concept in code: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7889 See merge request !7927
\| * \| \| \|	Don't check if stage name doesn't exist	Kamil Trzcinski	2016-12-08	2	-5/+3
\| \| \| \| \|
\| * \| \| \|	Fix specspipeline-stage	Kamil Trzcinski	2016-12-07	4	-14/+14
\| \| \| \| \|
\| * \| \| \|	Move .pipeline-graph to pipelines/graph	Kamil Trzcinski	2016-12-07	3	-3/+3
\| \| \| \| \|
\| * \| \| \|	Code review	Kamil Trzcinski	2016-12-07	7	-21/+18
\| \| \| \| \|
\| * \| \| \|	Add Ci::Status::Factory	Kamil Trzcinski	2016-12-07	4	-51/+76
\| \| \| \| \|
\| * \| \| \|	Fix success status	Kamil Trzcinski	2016-12-07	2	-2/+3
\| \| \| \| \|
\| * \| \| \|	Added Ci::Stage specs	Kamil Trzcinski	2016-12-06	8	-9/+165
\| \| \| \| \|
\| * \| \| \|	Update stage rendering views	Kamil Trzcinski	2016-12-06	8	-42/+35
\| \| \| \| \|
\| * \| \| \|	Fix handling of allowed to failure jobs	Kamil Trzcinski	2016-12-06	7	-63/+49
\| \| \| \| \|
\| * \| \| \|	Fix handling of skipped vs success status	Kamil Trzcinski	2016-12-06	2	-5/+5
\| \| \| \| \|
\| * \| \| \|	Fix test failures	Kamil Trzcinski	2016-12-06	4	-9/+11
\| \| \| \| \|
\| * \| \| \|	Added Stage tests	Kamil Trzcinski	2016-12-06	4	-1/+64
\| \| \| \| \|
\| * \| \| \|	Add Ci::Status::Stage	Kamil Trzcinski	2016-12-06	3	-0/+65
\| \| \| \| \|
\| * \| \| \|	Preserve stage values and use StaticModel	Kamil Trzcinski	2016-12-06	1	-5/+11
\| \| \| \| \|
\| * \| \| \|	Introduce `Ci::Stage`, right now this is artificial object that is build ↵	Kamil Trzcinski	2016-12-06	12	-59/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dynamically.
\| * \| \| \|	Fix broken pipeline rendering [ci skip]	Kamil Trzcinski	2016-12-06	2	-12/+11
\| \| \| \| \|
\| * \| \| \|	Support pipelines API	Kamil Trzcinski	2016-12-06	6	-21/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass `updated_at` to get only incremental changes since last update
* \| \| \| \|	Merge branch ↵	Sean McGivern	2016-12-08	5	-19/+99
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'25171-fix-mr-features-settings-hidden-when-builds-are-disabled' into 'master' Remove wrong '.builds-feature' class from the MR settings fieldset Closes #25171 See merge request !7930
\| * \| \| \| \|	Remove wrong '.builds-feature' class from the MR settings fieldset25171-fix-mr-features-settings-hidden-when-builds-are-disabled	Rémy Coutable	2016-12-07	5	-19/+99
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '24982-ux-improvement-sign-in-success-message' into 'master'	Sean McGivern	2016-12-08	4	-6/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #24982 See merge request !7837
\| * \| \| \| \| \|	fix: 24982- Remove'Signed in successfully' message	jnoortheen	2016-12-07	4	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After this change the sign-in-success flash message will not be shown refactor: set flash message to be nil while signing in test: changed tests to reflect removal of sign-in message refactor: adding signed_in message back See Merge Request !7837 issue#24982
* \| \| \| \| \| \|	Merge branch 'fix-all-dashboard' into 'master'	Sean McGivern	2016-12-08	5	-24/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't whitelist events for all filter Closes #24826 See merge request !7673
\| * \| \| \| \| \| \|	Add issue events filter and make sure "All" really shows everything	Oxan van Leeuwen	2016-12-04	5	-24/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, the EventFilter whitelists event types for the "All" filter. This has gotten outdated, which causes the confusing behaviour of the "All" tab not really showing all events. To make matters worse, by default no tab at all is selected, which does show all events, so selecting the "All" tab actually hides some events. Fix this by: - Making sure All always includes all activity, by abolishing the whitelist and just returning all events instead. - Make the All tab selected by default. - Add Issue events tab to include the specific events around opening and closing issues, since there was no specific filter to see them yet. Fixes #24826
* \| \| \| \| \| \| \|	Merge branch '24507_remove_deleted_branch_link_in_merge_request' into 'master'	Sean McGivern	2016-12-08	3	-1/+46
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary target branch link from MR page in case of deleted target branch Fixes #24507 See merge request !7916
\| * \| \| \| \| \| \| \|	add link_to_if helper on target_branch link on Merge Request show page for ↵	Rydkin Maxim	2016-12-08	3	-1/+46
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	case of deleted target branch add spec on #24507 bug description add changelog entry fix changelog remove unnecessary js:true from specs change spec title add test for link to target branch before deletions renamed spec about state of target branch link before and after deletion some fixes into spec
* \| \| \| \| \| \| \|	Merge branch 'group-members-in-project-members-view' into 'master'	Sean McGivern	2016-12-08	4	-6/+124
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Shows group members in the project members list Closes #24122 See merge request !7899
\| * \| \| \| \| \| \| \|	Handle an edge-case whith inviteesgroup-members-in-project-members-view	Rémy Coutable	2016-12-07	2	-11/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the project has invitees, no group members were returned due to a `user_id NOT IN (42, NULL)` query which always returned [] since a `user_id` would be NULL, thus the condition could never match. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Fixed if statement to use global group & project variables	Phil Hughes	2016-12-05	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed Ruby to be better for performance	Phil Hughes	2016-12-02	2	-18/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed controls not showing in groups which fixes tests
\| * \| \| \| \| \| \| \|	Shows group members in the project members list	Phil Hughes	2016-12-02	4	-2/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #24122