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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix Event#reset_project_activity updatessh-fix-events-update-spec	Stan Hu	2016-10-06	1	-1/+4
\| \| \| \| \| \| \| \|	!6678 removed the lease from Event#reset_project_activity, but it wasn't actually updating the project's last_activity_at timestamp properly. The WHERE clause would always return no matching projects. The spec passed occasionally because the created_at timestamp was automatically set to last_activity_at.
*	Merge branch 'fix-already-selected-activity-link' into 'master'	Fatih Acet	2016-10-06	3	-0/+131
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inconsistent highlighting of already selected activity nav-links ## What does this MR do? * Remove edge case where user could deselect an activity nav-link (which seems to be returning all the events) * Explicitly add an `All` tab to return all the events ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Resolves existing UI inconsistency ## Screenshots (if relevant) Before: ![4OzkoQVJYc](/uploads/fd2a7fdbde2159e875482ec7b828fe60/4OzkoQVJYc.gif) After: ![E0lj8UhEUU](/uploads/7eb5155861eb79d72957de04c9f172c9/E0lj8UhEUU.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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 you do - 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? * Closes #21631 * Closes #21452 See merge request !6091
\| *	Fix inconsistent highlighting of already selected activity nav-links	Clement Ho	2016-10-05	3	-0/+131
\| \|
* \|	Update user routing spec after constrainer logic changeddz-root-url	Dmitriy Zaporozhets	2016-10-06	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Make user constrainer lookup same as controller and add more constrainer tests	Dmitriy Zaporozhets	2016-10-06	3	-1/+20
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Fix users feature spec	Dmitriy Zaporozhets	2016-10-06	1	-13/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Change user & group landing page routing from /u/:name & /groups/:name to /:name	Dmitriy Zaporozhets	2016-10-06	5	-3/+53
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'issue-boards-new-issue' into 'master'	Fatih Acet	2016-10-06	3	-7/+170
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue boards new issue form ## What does this MR do? Adds a new issue form into the issue boards lists. ## Screenshots (if relevant) ![Screen_Shot_2016-10-03_at_14.57.30](/uploads/17fe6cd37bd020a2ee1688e0b496c18f/Screen_Shot_2016-10-03_at_14.57.30.png) ![Screen_Shot_2016-10-03_at_14.57.32](/uploads/c3f12bcb9ff9a0e7ce5b0bb06dfb0dd7/Screen_Shot_2016-10-03_at_14.57.32.png) ## What are the relevant issue numbers? Part of #21219 See merge request !6653
\| * \|	Add tests to Projects::Boards::IssuesController#create action	Douglas Barbosa Alexandre	2016-10-06	1	-7/+57
\| \| \|
\| * \|	Add service to create a new issue in a board list	Douglas Barbosa Alexandre	2016-10-06	1	-0/+33
\| \| \|
\| * \|	Added tests	Phil Hughes	2016-10-06	1	-0/+80
\| \| \|
* \| \|	Revert "Label list shows all issues (opened or closed) with that label"	Douglas Barbosa Alexandre	2016-10-06	1	-4/+4
\| \| \|
* \| \|	Merge branch 'rc-use-grape-dsl-to-document-members-api' into 'master'	Robert Speicher	2016-10-06	1	-4/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Use Grape DSL to document access requests and members endpoints Part of #21979, depends on gitlab-org/gitlab-ce!6267 and gitlab-org/gitlab-ce!6266. See merge request !6269
\| * \| \|	Use Grape DSL to document methods and their paramsrc-use-grape-dsl-to-document-members-api	Rémy Coutable	2016-10-05	1	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit'	Rémy Coutable	2016-10-06	2	-8/+269
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See !6096.
\| * \| \| \|	multi-file commit	Marc Siegfriedt	2016-10-05	2	-8/+269
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add docs and tests - add additional validation allow move without content updated response
* \| \| \| \|	Merge branch 'issue-board-api-support' into 'master'	Dmitriy Zaporozhets	2016-10-06	1	-0/+192
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue Board API support ## What does this MR do? Adds support for Issue Board in the API. ## Are there points in the code the reviewer needs to double check? ~~Double check whether the Issue Board list movement fix is needed.~~ Moved to a separate issue. [#22890](https://gitlab.com/gitlab-org/gitlab-ce/issues/22890) ## Why was this MR needed? Currently the API offers partial support to a project's Issue Board indirectly through Labels. This MR adds support for listing, creating, moving and removing board lists. ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [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 you do - 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? [#22195](https://gitlab.com/gitlab-org/gitlab-ce/issues/22195) See merge request !6646
\| * \| \| \|	Added Issue Board API support	Andre Guedes	2016-10-05	1	-0/+192
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Includes documentation and tests
* \| \| \| \|	Use higher size on Gitlab::Redis connection pool on Sidekiq servers	Paco Guzman	2016-10-06	1	-0/+34
\| \| \| \| \|
* \| \| \| \|	Merge branch 'feature/improve-async-pipeline-processing' into 'master'	Kamil Trzciński	2016-10-06	5	-3/+47
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve asynchronous pipeline processing ## What does this MR do? This MR improves asynchronous processing of pipeline. ## Why was this MR needed? It eliminates some race conditions and improves performance. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue / merge request numbers? Related merge request: !6410 Extracted from !6411 See merge request !6650
\| * \| \| \| \|	Add specs for new async ci pipeline workers	Grzegorz Bizon	2016-10-04	2	-0/+44
\| \| \| \| \| \|
\| * \| \| \| \|	Fix hipchat service specs after changes in pipeline	Grzegorz Bizon	2016-10-04	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix pipeline fixtures and calls to removed method	Grzegorz Bizon	2016-10-04	2	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge remote-tracking branch 'dev/master'	Rémy Coutable	2016-10-06	2	-0/+159
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'fix/id-claim-import-issue' into 'master'	Douwe Maan	2016-09-30	2	-0/+159
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent claiming associated model IDs via import On the import side, we should be careful not to use any IDs as part of the JSON file that could have been manipulated. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/20821 Things we already do (__before__ this fix): 1. Remove all primary keys 1. Always reassign some of the foreign keys, such as ALL project IDs and user IDs (so it would be difficult to impersonate or try to gain access to another project) 1. Ignore/reject attributes that do not exist in the model 1. If someone reassigns a foreign key `submodel_id`, and that object has another json as the submodel, the new submodel will reassign the `submodel_id` to the newly created submodel ID. Things we should do: 1. Remove/nullify any other foreign keys that we don't reassign (checked this, and there aren't many, fortunately. In fact, I don't think much harm can be done at all - at the moment). See merge request !1985
\| \| * \| \| \| \| \|	Prevent claiming associated model IDs via import and added relevant specs	James Lopez	2016-09-27	2	-0/+159
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge commit 'dev/security' into 'master'	Rémy Coutable	2016-10-06	10	-13/+114
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	fix export project file permissions issue	James Lopez	2016-09-30	2	-0/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix/escape-builds-commands-in-ci-linter' into 'security'	Robert Speicher	2016-09-28	1	-0/+35
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Escape HTML nodes in builds commands in ci linter This MR removes call to `simple_format` that behaves like `String#html_safe`, thus it passes unescaped HTML tags to the view. Closes #22541 See merge request !2001
\| \| * \| \| \| \| \| \|	Escape HTML nodes in builds commands in ci linter	Grzegorz Bizon	2016-09-26	1	-0/+35
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '22435-no-api-state-change-via-rails-session' into 'security'	Douwe Maan	2016-09-28	1	-6/+33
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: disable rails session auth for non-GET/HEAD requests Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22435 See merge request !1999
\| \| * \| \| \| \| \| \|	API: disable rails session auth for non-GET/HEAD requests	Nick Thomas	2016-09-23	1	-6/+33
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Enforce the fork_project permission in Projects::CreateService	Nick Thomas	2016-09-27	6	-7/+29
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Projects::ForkService delegates to this service almost entirely, but needed one small change so it would propagate create errors correctly. CreateService#execute needs significant refactoring; it is now right at the complexity limit set by Rubocop. I avoided doing so in this commit to keep the diff as small as possible. Several tests depend on the insecure behaviour of ForkService, so fi them up at the same time.
* \| \| \| \| \| \| \|	Merge branch 'revert-c676283b' into 'master'	Fatih Acet	2016-10-05	6	-13/+414
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated issuable form with GL dropdowns ## What does this MR do? This adds back in the GL dropdowns into the issuable form but fixes a lot of usability issues & bugs. ## What are the relevant issue numbers? Closes #19879, #19882, #19881, #19883, #19880 ## Screenshots (if relevant) ![Screen_Shot_2016-08-30_at_12.13.09](/uploads/f1df758b3fb59958b4e6b62960b81bfb/Screen_Shot_2016-08-30_at_12.13.09.png) ![Screen_Shot_2016-08-30_at_12.13.13](/uploads/6e4fd8f4d874b14eaab6b10752a19df4/Screen_Shot_2016-08-30_at_12.13.13.png) See merge request !5293
\| * \ \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵revert-c676283b	Fatih Acet	2016-10-05	4	-23/+49
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	revert-c676283b-existing # Conflicts: # app/assets/javascripts/dispatcher.js
\| * \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Fatih Acet	2016-10-05	14	-91/+378
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	revert-c676283b-existing
\| * \ \ \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Fatih Acet	2016-10-04	13	-58/+270
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	revert-c676283b-existing
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into revert-c676283b	Phil Hughes	2016-10-04	20	-55/+225
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Tests update	Phil Hughes	2016-10-03	1	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into revert-c676283b	Phil Hughes	2016-10-03	292	-2303/+10233
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Updated tests	Phil Hughes	2016-09-02	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into revert-c676283b	Phil Hughes	2016-09-02	87	-510/+2154
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into revert-c676283b	Phil Hughes	2016-08-30	551	-7961/+22936
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated wording in the specs	Phil Hughes	2016-07-21	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed failing issuable filter specs	Phil Hughes	2016-07-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses the selected values from the controller not the params	Phil Hughes	2016-07-20	2	-88/+283
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tests for new merge requests from forked project & owned project
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed Rubocop errors	Phil Hughes	2016-07-20	1	-30/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Added spec tests for merge request form including from forked project	Phil Hughes	2016-07-20	1	-0/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tests for new/edit issue form	Phil Hughes	2016-07-20	1	-0/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'revert-bdb6f1e6' into 'master'"	Phil Hughes	2016-07-20	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !5290