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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Only remove right connector of first build of last stage23849-pipeline-graph-bug	Annabel Dunstone Gray	2016-10-28	1	-2/+1
\|
*	Merge branch 'adam-fix-labels-find-or-create' into 'master'	Douwe Maan	2016-10-28	10	-46/+70
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass user instance to Labels::FindOrCreateService or skip_authorization: true ## What does this MR do? It fixes a bug described in #23694 when `project.owner` was passed to `Labels::FindOrCreateService`. `Labels::FindOrCreateService` expected a user instance and `project.owner` may return a group as well. This MR makes sure that we either pass a user instance or `skip_authorization: true`. ## Are there points in the code the reviewer needs to double check? - places where we pass `skip_authorization: true` ## Does this MR meet the acceptance criteria? - Tests - [x] 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) - [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? Fixes #23694 See merge request !7093
\| *	Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-create	Adam Niedzielski	2016-10-28	10	-46/+70
\| \| \| \| \| \| \| \| \| \| \| \|	Do not pass project.owner because it may return a group and Labels::FindOrCreateService throws an error in this case. Fixes #23694.
* \|	Merge branch 'use-optimistic-locking' into 'master'	Stan Hu	2016-10-28	14	-49/+122
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use optimistic locking ## What does this MR do? Removes the usage of pessimistic locking in favor of optimistic which is way cheaper and doesn't block database operation. Since this is very simple change it should be safe. If we receive `StaleObjectError` message we will reload object a retry operations in lock. However, I still believe that we need this one: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7005 as this will reduce a load on Database and FS. This changes a behavior from: ### Pesimistic locking (previous behavior) #### For updating 1. SELECT * FOR UPDATE (other updates wait on this) 2. we update ci_pipeline 3. latest_build_status 4. enqueue: (use: transition :created -> :pending) 5. [state_machine] we are in state created, we can go to pending 6. [state_machine] ci_pipeline.status = created 7. [state_machine] ci_pipeline.save 8. [state_machine] after_transition: (if for success): PipelineSuccessWorker on Sidekiq 9. release DB lock #### If no update is required 1. SELECT * FOR UPDATE (other updates wait on this) 2. we update ci_pipeline 3. latest_build_status 4. we are in pending, we can't transition to pending, because it's forbidden 5. release DB lock ### Optimistic locking (implemented by this MR) #### For updating 1. latest_build_status 2. enqueue: (use `transition :created -> :pending`) 3. [state_machine] we are in state created, we can go to pending 4. [state_machine] ci_pipeline.status = created 5. [state_machine] ci_pipeline.save 6. [state_machine] [save] where(lock_version: ci_pipeline.lock_version).update_all(status: :created, updated_at: Time.now) 7. [state_machine] [save] unless we_updated_row then raise ObjectInconsistentError #### If no update is required 1. we update ci_pipeline 2. latest_build_status 3. we are in pending, we can't transition to pending, because it's forbidden ## Why was this MR needed? We have been seeing a number of problems when we migrated Pipeline/Build processing to Sidekiq. Especially we started seeing a lot of blocking queries. We used a pessimistic locking which doesn't seem to be required. This effectively allows us to fix our issues with blocked queries by using more efficient method of operation. ## What are the relevant issue numbers? Issues: https://gitlab.com/gitlab-com/infrastructure/issues/623 and https://gitlab.com/gitlab-com/infrastructure/issues/584, but also there's a bunch of Merge Requests that try to improve behavior of scheduled jobs. cc @pcarranza @yorickpeterse @stanhu See merge request !7040
\| * \|	Make retry_lock to not be infiniteuse-optimistic-locking	Kamil Trzcinski	2016-10-27	3	-5/+20
\| \| \|
\| * \|	Fix Rubocop unused variables warning	Stan Hu	2016-10-26	1	-2/+2
\| \| \|
\| * \|	Remove puts to solve Rubocop errors	Stan Hu	2016-10-26	1	-2/+0
\| \| \|
\| * \|	Fix duration specs	Kamil Trzcinski	2016-10-26	1	-14/+7
\| \| \|
\| * \|	Fix optimistic locking	Kamil Trzcinski	2016-10-26	7	-16/+27
\| \| \|
\| * \|	Add tests for optimistic locking	Kamil Trzcinski	2016-10-26	5	-7/+38
\| \| \|
\| * \|	Use optimistic locking	Kamil Trzcinski	2016-10-26	6	-25/+50
\| \| \|
* \| \|	Merge branch 'issue-board-welcome-cookie-monster' into 'master'	Robert Speicher	2016-10-28	4	-2/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete issue board welcome cookie ## What does this MR do? This was seen in the idea to production demo, because the project had already existed on the exact same URL the cookie already existed which meant the blank state wasn't shown. This MR deletes the cookie on project create. See merge request !6899
\| * \| \|	Fixed boards store specissue-board-welcome-cookie-monster	Phil Hughes	2016-10-28	2	-3/+5
\| \| \| \|
\| * \| \|	Delete issue board welcome cookie when project is new	Phil Hughes	2016-10-28	3	-2/+7
\| \| \| \|
* \| \| \|	Merge branch 'clean-up-issue_spec.js' into 'master'	Rémy Coutable	2016-10-28	10	-95/+244
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace static fixture by generated one in issue_spec.js ## What does this MR do? - clean up `issue_spec.js` - introduce an alternative approach to #19445 - rename `rake teaspoon` to `rake teaspoon:tests` - introduce `rake teaspoon:fixtures` which generates fixtures using RSpec - introduce `rake teaspoon` which runs `rake teaspoon:fixtures` and `rake teaspoon:tests` ## Why was this MR needed? - many duplications - missing existence checks - missing conditions - static fixtures don't match real views ## Reasoning I want to explain some of my decisions here, so that they stay visible for future discussions. ### Why not HAML? - same number of HAML templates as number of fixtures (many input files) - embedded logic less readable - can not be rendered by JavaScript (because of inline Ruby) ### Why RSpec? - real controllers for fixtures - spys available for mocking - easily report failed fixture generations ### Why not magic_lamp? (#19445) - introduces another dependency/tool - needs to run a server concurrently to teaspoon - makes it harder to use a JavaScript test runner - static HTML files serve faster See merge request !6059
\| * \| \|	Document how to run frontend tests	Winnie	2016-10-28	1	-0/+14
\| \| \| \|
\| * \| \|	Replace static issue fixtures by script (!6059)	winniehell	2016-10-28	9	-42/+134
\| \| \| \|
\| * \| \|	Clean up issue_spec.js	winniehell	2016-10-28	1	-59/+102
\| \| \| \|
* \| \| \|	Merge branch 'fix/make-github-import-retryable' into 'master'	Sean McGivern	2016-10-28	12	-27/+120
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modify GitHub importer to be retryable Closes #23533 See merge request !7003
\| * \| \| \|	Fix typosfix/make-github-import-retryable	Ahmad Sherif	2016-10-28	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Abstract the use of imported[!?] and {current,increment}_page in GitHub importer	Ahmad Sherif	2016-10-28	1	-50/+34
\| \| \| \| \|
\| * \| \| \|	Use public_send instead of send	Ahmad Sherif	2016-10-28	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Modify GitHub importer to be retryable	Ahmad Sherif	2016-10-28	9	-27/+136
\| \| \| \| \|
\| * \| \| \|	Check if repository already exists before trying to re-import it	Ahmad Sherif	2016-10-28	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch '5905-duplicate-email-errors' into 'master'	Rémy Coutable	2016-10-28	3	-1/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show one error message for an invalid email Changes it to only validate the notification_email format if it's different from email. Closes #5905 See merge request !7158
\| * \ \ \ \	Merge branch 'master' into 5905-duplicate-email-errors	Steve Halasz	2016-10-27	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get fix for teaspoon tests
\| * \ \ \ \ \	Merge branch 'master' into 5905-duplicate-email-errors	Steve Halasz	2016-10-27	401	-873/+3487
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Getting latest CHANGELOG so I can resolve merge conflict
\| * \| \| \| \| \| \|	Add changelog entry	Steve Halasz	2016-10-27	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Only show one error message for an invalid email	Steve Halasz	2016-10-27	2	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If notification_email is blank, it's set from email. If an admin attempted to create a user with an invalid email, an error would be displayed for both fields. Only validate the notification_email if it's different from email.
* \| \| \| \| \| \| \|	Merge branch 'bugfix/dragging_milestones' into 'master'	Sean McGivern	2016-10-28	4	-2/+90
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop unauthorized users dragging on milestone page Closes #13670 See merge request !7113
\| * \| \| \| \| \| \|	Merge branch 'bugfix/dragging_milestones' of gitlab.com:blackst0ne/gitlab-ce ↵	blackst0ne	2016-10-28	0	-0/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into bugfix/dragging_milestones
\| \| * \| \| \| \| \| \|	Stop unauthorized users dragging on milestone page	blackst0ne	2016-10-28	4	-2/+90
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Stop unauthorized users dragging on milestone page	blackst0ne	2016-10-28	4	-2/+90
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'deploykeys-api-doc' into 'master'	Rémy Coutable	2016-10-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document admin access requirement for /deploy_keys endpoint Closes #23807 See merge request !7164
\| * \| \| \| \| \| \| \|	Document admin access requirement for /deploy_keys endpoint	winniehell	2016-10-28	1	-1/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '23928-sortable-highest_label_priority-is-bugged' into 'master'	Rémy Coutable	2016-10-28	5	-52/+102
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix and improve `Sortable.highest_label_priority` Closes #23928 See merge request !7165
\| * \| \| \| \| \| \| \|	Fix and improve `Sortable.highest_label_priority`23928-sortable-highest_label_priority-is-bugged	Alejandro Rodríguez	2016-10-27	5	-52/+102
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '23890-api-should-accepts-boolean' into 'master'	Sean McGivern	2016-10-28	3	-11/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Fix booleans not recognized as such when using the `to_boolean` helper Fixes #22831 Fixes #23890 See merge request !7149
\| * \| \| \| \| \| \| \|	API: Fix booleans not recognized as such when using the `to_boolean` helper23890-api-should-accepts-boolean	Rémy Coutable	2016-10-27	3	-11/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'issue_1008_1' into 'master'	Sean McGivern	2016-10-28	44	-499/+516
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Jira refactoring to jira gem part of gitlab-org/gitlab-ee#1008 Original MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2572/commits See merge request !6598
\| * \| \| \| \| \| \| \| \|	Upgrade jira-ruby gem versionissue_1008_1	Felipe Artur	2016-10-26	3	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Finish updates to use JIRA gem	Felipe Artur	2016-10-26	43	-542/+391
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Code improvements, bug fixes, finish documentation and specs
\| * \| \| \| \| \| \| \| \|	Refactor JIRA service to use gem	Drew Blessing	2016-10-26	7	-145/+313
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '23875-fixup-failing-spec' into 'master'	Douwe Maan	2016-10-28	1	-4/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent a spec from failing in `spec/features/merge_requests/diff_notes_resolve_spec.rb` ## What does this MR do? Fixes a failing spec in `spec/features/merge_requests/diff_notes_resolve_spec.rb` ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Tests failing on master. RSpec executes inner `before` blocks after outer `before` blocks, so the second note was being added after loading the page, and then being pulled in by running JS on the page, causing intermittent failures if we clicked the resolve button before the note was loaded. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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? Closes #23875 See merge request !7150
\| * \| \| \| \| \| \| \| \|	Fix a failing spec in diff_notes_resolve_spec.rb	Nick Thomas	2016-10-28	1	-4/+6
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/gh-import-bugs' into 'master'	Sean McGivern	2016-10-28	4	-13/+26
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix couple of GitHub importing bugs Fix a bug in GH comment importing and label applying for imported MRs. See merge request !7139
\| * \| \| \| \| \| \| \|	Fix importing MR comments from GitHubfix/gh-import-bugs	Ahmad Sherif	2016-10-27	2	-6/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix applying labels for GitHub-imported MRs	Ahmad Sherif	2016-10-27	4	-7/+18
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'modal-mergerequest-shorten-clipboard' into 'master'	Annabel Dunstone Gray	2016-10-27	2	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	edited stylesheet with mr modal fixes and added to changelog ## What does this MR do? It shortens the modal command merge info elements. ## Are there points in the code the reviewer needs to double check? I used the `.dark` class.. is that correct usage? Made no issue as this is a minor upgrade to UI ## Why was this MR needed? Clipboard buttons could obscure information in the merge info modal, this way its clean. ## Screenshots (if relevant) From: ![image](/uploads/99269c9a314c593cb06239c27565b07c/image.png) To: ![image](/uploads/7e278a5aaa8c57270e8a320cc270b5d8/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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, its a quick fix See merge request !7145
\| * \| \| \| \| \| \| \| \|	edited stylesheet with mr modal fixes and added to changelogmodal-mergerequest-shorten-clipboard	Dimitrie Hoekstra	2016-10-27	2	-0/+5
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|