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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'capitalize-mentioned-issue-notes' into 'master'	Douwe Maan	2016-08-26	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Capitalize mentioned issue timeline notes ## What does this MR do? Renames `mentioned in` to `Mentioned in` for issue timeline notes ## Are there points in the code the reviewer needs to double check? Shouldn't be any :smile: ## Why was this MR needed? Resolves existing UI inconsistency as all the other issue timeline notes have their first letter capitalized. ## What are the relevant issue numbers? Closes #21416 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-25_at_10.52.47_AM](/uploads/61de0a7d65fd739a6e565f6e63d2f52d/Screen_Shot_2016-08-25_at_10.52.47_AM.png) After: ![Screen_Shot_2016-08-25_at_10.52.05_AM](/uploads/f67f353c285453306d6b80578b11e587/Screen_Shot_2016-08-25_at_10.52.05_AM.png) ## 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) See merge request !6028
\| *	Capitalize mentioned issue timeline notes	Clement Ho	2016-08-25	1	-1/+1
\| \|
* \|	Merge branch '21275-getting-500-error-when-viewing-a-merge-request'	Douwe Maan	2016-08-25	1	-0/+13
\|\ \
\| * \|	Don't show conflicts when there are none	Sean McGivern	2016-08-25	1	-0/+6
\| \| \|
\| * \|	Handle case where conflicts aren't on disk yet	Sean McGivern	2016-08-25	1	-0/+7
\| \| \|
* \| \|	Merge branch 'statuseable-hasstatus' into 'master'	Robert Speicher	2016-08-25	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rename Statuseable to HasStatus ## What does this MR do? - Rename all instances of Statuseable in the codebase, to HasStatus - Rename all files from statuseable to has_status ## What are the relevant issue numbers? Closes #21103 See merge request !6003
\| * \| \|	rename Statuseable to HasStatus	De Wet Blomerus	2016-08-25	1	-3/+3
\| \|/ /
* \| \|	Merge branch 'dz-merge-request-version'	Douwe Maan	2016-08-25	2	-13/+56
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add code improvements to merge request version feature	Dmitriy Zaporozhets	2016-08-25	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add MergeRequestDiff#latest? * Remove unnecessary variable assignment Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Restore diff_sha_refs method	Dmitriy Zaporozhets	2016-08-22	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Merge branch 'master' into dz-merge-request-version	Dmitriy Zaporozhets	2016-08-22	7	-10/+106
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \ \	Merge branch 'master' into dz-merge-request-version	Dmitriy Zaporozhets	2016-08-19	28	-66/+1695
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix merge request diffs spec	Dmitriy Zaporozhets	2016-08-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix and refactor merge request diff_refs method	Dmitriy Zaporozhets	2016-08-15	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Merge branch 'master' into dz-merge-request-version	Dmitriy Zaporozhets	2016-08-15	49	-575/+778
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Add MergeRequest#branch_merge_base_commit method	Dmitriy Zaporozhets	2016-08-08	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Fix merge request spec for update diff note	Dmitriy Zaporozhets	2016-08-02	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Chnage the way how merge request diff is initialized and saved	Dmitriy Zaporozhets	2016-08-02	1	-9/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Change merge request diff creation from callback to part of the service	Dmitriy Zaporozhets	2016-08-02	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Add more tests to merge_request_diff and improve initialize	Dmitriy Zaporozhets	2016-08-02	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Reload merge request association reload when update code	Dmitriy Zaporozhets	2016-08-02	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Improve merge request diff creation and update tests	Dmitriy Zaporozhets	2016-08-02	1	-12/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Display project icon from default branch	Hannes Rosenögger	2016-08-25	1	-0/+31
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit makes sure that the project icon is being read from the default branch instead of 'master'
* \| \| \| \|	Show "Create Merge Request" widget for push events to fork projects on the ↵	Paco Guzman	2016-08-24	1	-0/+10
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	source project
* \| \| \|	Fix Error 500 resulting when loading network graphfix-network-graph-error-500	Stan Hu	2016-08-20	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`discussion_id` may not be present when the SELECT call for notes does not include this attribute. Don't attempt to set the discussion ID unless the model contains the attribute. Closes #21119, #21128
* \| \| \|	Make Ability#project_abilities return unique values and fix countsfix-rspec-failures-due-to-cached-permissions	Stan Hu	2016-08-20	1	-9/+10
\| \| \| \|
* \| \| \|	Add spec for Ability.project_abilities	Stan Hu	2016-08-20	1	-0/+63
\| \| \| \|
* \| \| \|	Disable “issue by email” feature until it uses a different token	Douwe Maan	2016-08-19	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'wall-clock-time-for-showing-pipeline' into 'master'	Robert Speicher	2016-08-19	2	-7/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show wall-clock time when showing pipeline ## What does this MR do? Show wall-clock time when showing pipeline instead of cumulative builds time. Closes #17007 See merge request !5734
\| * \| \| \|	Now we already included it in spec_helper.rbwall-clock-time-for-showing-pipeline	Lin Jen-Shin	2016-08-20	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-08-20	1	-0/+8
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wall-clock-time-for-showing-pipeline * upstream/master: (50 commits) Increased vertical alignment of labels for issues in lists Changed file name Updated spec HAML Changed tests to use JS tests Addressed feedback Made logic simpler by moving away from underscorejs Added tooltip to label value in collapsed sidebar Add play icon SVG Have hover color of builds span full width Fix alignment of icon on commits page Change sleep to wait_for_ajax Added tests Destroy branch delete tooltip when row is removed Move and improvement comment in pipeline fixtures Fix notification_service argument error of declined invitation emails Update contribution acceptance criteria with tests requirements Fixed keyboard shortcuts not working on issue boards Hides tooltip when dragging Fixes issue with cursor not changing when dragging Hides tooltips when dragging issues Add a spec testing a second side effect of `Repository#merge`. drop execute bit ...
\| * \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-08-19	10	-1/+1366
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wall-clock-time-for-showing-pipeline * upstream/master: (554 commits) Fix expansion of discussions in diff Improve performance of MR show page Fix jumping between discussions on changes tab Update doorkeeper to 4.2.0 Fix MR note discussion ID Handle legacy sort order values Refactor `find_for_git_client` and its related methods. Remove right margin on Jump button icon Fix bug causing “Jump to discussion” button not to show Small refactor and syntax fixes. Removed unnecessary service for user retrieval and improved API error message. Added documentation and CHANGELOG item Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner Password Credentials flow. Fix behavior around commands with optional arguments Fix behavior of label_ids and add/remove_label_ids Remove unneeded aliases Do not expose projects on deployments Incorporate feedback Docs for API endpoints Expose project for environments ...
\| * \| \| \| \|	Use travel_to instead of dependency injection, feedback:	Lin Jen-Shin	2016-08-19	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5734#note_14056642
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-08-17	10	-24/+250
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wall-clock-time-for-showing-pipeline * upstream/master: (99 commits) Update CHANGELOG for 8.10.6, 8.9.7, and 8.8.8 Updated Akismet documentation Add hover state to todos (!5361) Load issues and merge requests templates from repository Backport EE assertions in protected branch related specs. Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'" Fix a missed `before_action` for `AutocompleteController`. Backport `AutocompleteController#load_project` from EE!581. Fix API::BranchesSpec. Fix failing tests relating to backporting ee!581. Revert unrelevant changes Fix the protected branches factory. Improve EE compatibility with protected branch access levels. Move the "update" portion of the protected branch view into a partial. Don't select an access level if already selected. Backport changes from gitlab-org/gitlab-ee!581 to CE. Further refactor and syntax fixes. Upgrade httpclient gem from 2.7.0.1 to 2.8.2. Make rubocop happy Make rubocop happy ...
\| * \| \| \| \| \|	pipeline duration no longer depends on builds	Lin Jen-Shin	2016-08-15	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Introduce Gitlab::Utils.now so that it's easier to stub	Lin Jen-Shin	2016-08-15	1	-3/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'expiration-date-on-memberships' into 'master'	Douwe Maan	2016-08-19	1	-2/+12
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
\| * \| \| \| \| \|	Merge branch 'master' into 'expiration-date-on-memberships'	Sean McGivern	2016-08-19	5	-1/+1108
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \|	Merge branch 'master' into expiration-date-on-memberships	Sean McGivern	2016-08-18	59	-674/+1452
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Replace optional parameters with keyword arguments.	Adam Niedzielski	2016-08-02	1	-2/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add a spec testing a second side effect of `Repository#merge`.21081-repository-merge-in-progress-merge-commit-sha-spec	Timothy Andrew	2016-08-19	1	-0/+8
\| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- It sets the `in_progress_merge_commit_sha` variable on the given merge request, so that the branch permissions (developers can merge) check can proceed in the `pre-receive` hook.
* \| \| \| \| \| \|	Merge branch 'master' into diff-line-comment-vuejs	Connor Shea	2016-08-17	5	-0/+211
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'issue-boards' into 'master'	Douwe Maan	2016-08-17	4	-0/+132
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue boards ## What are the relevant issue numbers? - Issue: #17907 - Issue backend: #20335 - Backend MR: !5548 - Frontend MR: !5554 - Documentation !5713 ## Screenshots (if relevant) ## 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 [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5548
\| \| * \| \| \| \| \|	Add a movable scope and a movable? method to List model	Douglas Barbosa Alexandre	2016-08-17	1	-0/+20
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add a destroyable scope and a destroyable? method to List model	Douglas Barbosa Alexandre	2016-08-17	1	-0/+20
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Remove useless delegate method on List model	Douglas Barbosa Alexandre	2016-08-17	1	-4/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Destroy related lists when a label is removed	Douglas Barbosa Alexandre	2016-08-17	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Ensure that we have only one list per label per board	Douglas Barbosa Alexandre	2016-08-17	1	-0/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Remove label_list factory	Douglas Barbosa Alexandre	2016-08-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	The lists: Backlog, and Done cannot be destroyed	Douglas Barbosa Alexandre	2016-08-17	2	-1/+22
\| \| \| \| \| \| \| \|