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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Remove unused data attributes	Annabel Dunstone	2016-08-17	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Update changelog	Annabel Dunstone	2016-08-17	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Style build dropdowns	Annabel Dunstone	2016-08-17	2	-24/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Populate dropdowns with current build on pageload	Annabel Dunstone	2016-08-17	2	-3/+17
\| \| \| \| \| \|
\| * \| \| \| \|	Selecting stage updates builds dropdown	Annabel Dunstone	2016-08-17	2	-14/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Add data attributes to builds	Annabel Dunstone	2016-08-17	3	-39/+29
\| \| \| \| \| \|
\| * \| \| \| \|	Change active state of list items; style dropdown items	Annabel Dunstone	2016-08-17	1	-0/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Hide dropdown if all tests fit on one line; add counter to dropdown	Annabel Dunstone	2016-08-17	3	-9/+27
\| \| \| \| \| \|
\| * \| \| \| \|	Add overflow tests to dropdown	Annabel Dunstone	2016-08-17	2	-11/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Order by build status	Annabel Dunstone	2016-08-17	1	-1/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'button-icons-alignment' into 'master'	Jacob Schatz	2016-08-17	4	-4/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix icon alignment of star and fork buttons ## What does this MR do? Fix alignment of star and fork icons. ## Why was this MR needed? Buttons had more padding on the left than on the right. ## What are the relevant issue numbers? fixes #20001 ## Screenshots <table> <thead><th>Before</th><th>After</th></thead> <tr> <td><img alt="fork-button-before" src="/uploads/664c0bc935f4c48899f5b63a1c215cbc/fork-button-before.png"></td> <td><img alt="fork-button-after" src="/uploads/9385427a5b178487bd24cd2f8ec4a5ed/fork.png"></td> </tr> <tr> <td><img alt="project-buttons-before" src="/uploads/48ef41458433b468afc2919eb24849cc/project-buttons-before.png"></td> <td><img alt="project-buttons-after" src="/uploads/3bafe6e68645d787a2cdb79cd164335f/project-actions.png"></td> </tr> </table> See merge request !5451
\| * \| \| \| \| \|	add space between icon and button text	winniehell	2016-08-17	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix fork button icon alignment	winniehell	2016-08-17	2	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix star button icon alignment	winniehell	2016-08-17	1	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'remove-sleep-calls-from-phantom-update-spinach-specs' into ↵	Robert Speicher	2016-08-17	2	-3/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove sleep calls introduced in !5740 See merge request !5815
\| * \| \| \| \| \| \|	Now waits for All issuables to load when clickedremove-sleep-calls-from-phantom-update-spinach-specs	Luke Bennett	2016-08-17	2	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Removed sleep calls introduced in !5740	Luke Bennett	2016-08-17	2	-3/+0
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '2451-fix-mentions-in-issue-updates' into 'master'	Robert Speicher	2016-08-17	17	-5/+206
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send notification emails when users are newly mentioned in issue or MR edits ## What does this MR do? Introduces "new mention in issue" and "new mention in MR" email notifications. Editing a Mentionable title or description and adding a mention to a user who was not previously mentioned will now send them a notification email, following usual permissions for doing so. ## Why was this MR needed? Issues & MRs may be edited to include mentions to new people. We don't currently send out email notifications of these edits to anyone, although they do create TODOs. This brings email notifications into parity with TODOs. ## What are the relevant issue numbers? Closes #2451 See merge request !5800
\| * \| \| \| \| \| \|	Fix a rubocop violation	Nick Thomas	2016-08-17	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	DRY up the additions to notification_service_spec.rb	Nick Thomas	2016-08-16	1	-46/+28
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	DRY up the added update service specs, add two email helpers	Nick Thomas	2016-08-16	4	-62/+49
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Include the reason for emailing in the new_mention emails	Nick Thomas	2016-08-16	2	-0/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Address minor review comments for tests	Nick Thomas	2016-08-16	3	-17/+17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add new mention notifications to changelog	Nick Thomas	2016-08-15	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Allow people to subscribe to mentions in updated MRs and Issues	Nick Thomas	2016-08-15	3	-6/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This slightly changes the semantics of the 'New Issue' and 'New MR' events to include new mentions in edited Mentionables. An alternative would be to introduce 'Issue updated' and 'MR updated' events, but that would lead to questions about why those events were only available to new mentions, and not existing mentions as well, so hold off for now.
\| * \| \| \| \| \| \|	Add notifications for new user mentions in merge requests	Nick Thomas	2016-08-15	7	-1/+107
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove superfluous parens on a method call	Nick Thomas	2016-08-15	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Nick Thomas	2016-08-15	44	-124/+437
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	2451-fix-mentions-in-issue-updates
\| * \| \| \| \| \| \| \|	Fix a 'missing keyword' error introduced in the last commit	Nick Thomas	2016-08-15	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Nick Thomas	2016-08-12	38	-163/+451
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	2451-fix-mentions-in-issue-updates
\| * \| \| \| \| \| \| \| \|	Send notification emails when users are newly mentioned in issue edits	Nick Thomas	2016-08-12	8	-3/+111
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-issuable-filter' into 'master'	Douglas Barbosa Alexandre	2016-08-17	3	-3/+43
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide "Create new list button" on Issues and MRs pages ![1](/uploads/d8b08cb62cfc9e9d29e3e64b2ed0a8af/1.png) /cc @jschatz1 See merge request !5852
\| * \| \| \| \| \| \| \| \| \|	Hide `Create new list button` on Issues and MRs pages	Douglas Barbosa Alexandre	2016-08-17	3	-3/+43
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'add-delimiter-project-stats' into 'master'	Jacob Schatz	2016-08-17	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add delimiter to project stars and forks count ## What does this MR do? Adds the `number_with_delimiter()`to the project stars and fork counts on the projects dashboard. ## Are there points in the code the reviewer needs to double check? Shouldn't be any :smiley: ## Why was this MR needed? Improve readability and adhere to the [UI guide](https://gitlab.com/help/development/ui_guide.md#counts) ## What are the relevant issue numbers? Closes #20746 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-09_at_1.30.44_PM](/uploads/69592ce220d64774e265cfbcfcb6864a/Screen_Shot_2016-08-09_at_1.30.44_PM.png) After: ![Screen_Shot_2016-08-09_at_1.30.58_PM](/uploads/1470179256614c2e47cc9d0e49aeaf09/Screen_Shot_2016-08-09_at_1.30.58_PM.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 !5741
\| * \| \| \| \| \| \| \| \| \|	Add delimiter to project stars and forks count	Clement Ho	2016-08-09	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '20808-merge-request-new-diff-view' into 'master'	Robert Speicher	2016-08-17	3	-1/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix merge request new view not changing code view rendering style Correctly respects the code view changing when creating a merge request. Closes #20808 See merge request !5768
\| * \| \| \| \| \| \| \| \| \| \|	Fix merge request new view not changing code view rendering style20808-merge-request-new-diff-view	Paco Guzman	2016-08-11	3	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue-boards' into 'master'	Douwe Maan	2016-08-17	89	-85/+5635
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'issue-boards-ui' into 'issue-boards'	Jacob Schatz	2016-08-17	41	-89/+3884
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue boards UI ## What does this MR do? UI for issue boards. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? - Issue: #17907 - Backend MR: !5548 - Frontend MR: !5554 - Documentation !5713 ## Screenshots (if relevant) ![Screen_Shot_2016-08-17_at_14.06.06](/uploads/e2abed987d2c2d280e8b8034c8949024/Screen_Shot_2016-08-17_at_14.06.06.png) See merge request !5554
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Removed vue assets	Phil Hughes	2016-08-17	2	-10080/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Test update	Phil Hughes	2016-08-17	1	-20/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It wasnt testing what it was saying it should be...
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fixed failing test	Phil Hughes	2016-08-17	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Added wait for vue in logged out & guest tests	Phil Hughes	2016-08-17	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fixed bug when moving list	Phil Hughes	2016-08-17	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Removed if around board deleting	Phil Hughes	2016-08-17	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed duplication
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fixed permissions around create new list button	Phil Hughes	2016-08-17	2	-2/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Code improvements	Phil Hughes	2016-08-17	3	-41/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Improved code readability	Phil Hughes	2016-08-17	9	-124/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Testing builds	Phil Hughes	2016-08-17	1	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix feature spec for issues board	Douglas Barbosa Alexandre	2016-08-17	1	-16/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \|