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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed MR handling when GitLab CI project is not presentfix-ci-handling	Kamil Trzcinski	2015-09-21	2	-3/+8
\|
*	Merge branch 'notification-levels' into 'master'	Douwe Maan	2015-09-21	11	-3/+126
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notification levels can now be set on the Project's main page ![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png) The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level. Saving is done via a remote form submission and if successful shows the user a flash message: ![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png) @DouweM can you please review my code. I gave my bestest effort to make in clean and readable. @rspeicher hopefully we can include it with the 8.0 release, maybe? /cc @darby See merge request !1322
\| *	Minor code cleanupnotification-levels	Douwe Maan	2015-09-20	3	-24/+23
\| \|
\| *	Use the `find_by_user_id` magic finder instead of `where`.	Patricio Cano	2015-09-16	1	-1/+1
\| \|
\| *	Updated label from `Mention` to `On Mention`.	Patricio Cano	2015-09-16	1	-1/+1
\| \|
\| *	Merge branch 'master' into notification-levels	Patricio Cano	2015-09-16	389	-571/+17165
\| \|\
\| * \	Merge branch 'master' into notification-levels	Patricio Cano	2015-09-16	133	-551/+1050
\| \|\ \
\| * \| \|	Added Global to the drop downs and updated the label of the button to show ↵	Patricio Cano	2015-09-16	5	-15/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the current level instead of `Notifications`
\| * \| \|	Added Spinach tests and updated CHANGELOG	Patricio Cano	2015-09-16	3	-0/+21
\| \| \| \|
\| * \| \|	Replaced `this` with `@` in the coffee file and added an arrow that clearly ↵	Patricio Cano	2015-09-14	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	marks the Notifications button as a drop down
\| * \| \|	Notification dropdown now shows currently active level, and also shows what ↵	Patricio Cano	2015-09-14	4	-10/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the actual value of `global` is, if the project has the notification level set to global.
\| * \| \|	Corrected `case` indentation to conform with Rubocop	Patricio Cano	2015-09-14	1	-22/+22
\| \| \| \|
\| * \| \|	Added spacing to icons in Notification drop down	Patricio Cano	2015-09-14	1	-4/+4
\| \| \| \|
\| * \| \|	Notification level can now be saved from within the project view.	Patricio Cano	2015-09-14	6	-21/+32
\| \| \| \|
\| * \| \|	Fixed notification level list item helper.	Patricio Cano	2015-09-14	1	-12/+8
\| \| \| \|
\| * \| \|	PAtrially working notification button	Darby	2015-09-14	4	-0/+49
\| \| \| \|
* \| \| \|	Merge branch 'sh-fix-issue-2585' into 'master'	Dmitriy Zaporozhets	2015-09-21	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Markdown area formatting consistent Issue #2585 See merge request !1354
\| * \| \| \|	Make Markdown area formatting consistentsh-fix-issue-2585	Stan Hu	2015-09-18	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ci-migrate-version-fix' into 'master'	Marin Jankovski	2015-09-21	1	-4/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use GitlabCi::VERSION when checking migration See merge request !1368
\| * \| \| \| \|	Use GitlabCi::VERSION when checking migration	Kamil Trzcinski	2015-09-21	1	-4/+2
\|/ / / / /
* \| \| \| \|	Merge branch 'optimize-ci-tags-migration' into 'master'	Marin Jankovski	2015-09-21	7	-73/+191
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI migration rake task for GitLab CE - Uses backup format for final GitLab CI 8.0 - Highly optimized tags migration SQL queries See merge request !1365
\| * \| \| \| \|	Use INSERT INTO to insert tags	Kamil Trzcinski	2015-09-21	1	-7/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Change wordingoptimize-ci-tags-migration	Kamil Trzcinski	2015-09-21	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Disable CI for time of migration	Kamil Trzcinski	2015-09-21	1	-0/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Change notices during migrating	Kamil Trzcinski	2015-09-21	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Create CI migration task on GitLab side	Kamil Trzcinski	2015-09-20	4	-40/+152
\| \| \| \| \| \|
\| * \| \| \| \|	Use pure SQL queries to migrate CI tags	Kamil Trzcinski	2015-09-20	1	-33/+25
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fail-ci-builds-without-yml' into 'master'	Dmitriy Zaporozhets	2015-09-21	3	-1/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fail ci builds without yml Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/2551 See merge request !1349
\| * \| \| \| \| \|	Rubocop fixfail-ci-builds-without-yml	Kamil Trzcinski	2015-09-20	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fail builds if no .gitlab-ci.yml is found	Kamil Trzcinski	2015-09-20	3	-1/+15
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'fix-markdown-links-in-dashboard' into 'master'	Douwe Maan	2015-09-21	3	-2/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Markdown links not showing up in dashboard activity feed Closes #2586 See merge request !1353
\| * \| \| \| \| \|	Fix Markdown links not showing up in dashboard activity feed	Stan Hu	2015-09-20	3	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2586
* \| \| \| \| \| \|	Merge branch 'reply-by-email-diff' into 'master'	Robert Speicher	2015-09-21	5	-7/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix reply by email for comments on a specific line in a diff/commit. Fixes #2363. See merge request !1364
\| * \| \| \| \| \| \|	Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diff	Douwe Maan	2015-09-20	5	-7/+24
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gmail_actions_doc' into 'master'	Job van der Voort	2015-09-20	3	-1/+23
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Gmail actions button for GitLab doc. Resolves #1517 by adding doc with some notes. See merge request !1327
\| * \| \| \| \| \| \|	Update the link in integration readme.gmail_actions_doc	Marin Jankovski	2015-09-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove double png.	Marin Jankovski	2015-09-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add Gmail actions button for GitLab doc.	Marin Jankovski	2015-09-17	2	-0/+22
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-ci-link-on-project-page' into 'master'	Kamil Trzciński	2015-09-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 when showing project page and there's no CI project present This fixes 500 when: 1. GitLabCiService is active 2. There's no project in ci_projects table See merge request !1338
\| * \| \| \| \| \| \|	Fix 500 when showing project page and there's no CI project presentfix-ci-link-on-project-page	Kamil Trzcinski	2015-09-18	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'style-pagination' into 'master'	Dmitriy Zaporozhets	2015-09-20	4	-10/+43
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apply new design to pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1362
\| * \| \| \| \| \| \| \|	Apply new design to paginationstyle-pagination	Dmitriy Zaporozhets	2015-09-19	4	-10/+43
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'ci-build-list' into 'master'	Dmitriy Zaporozhets	2015-09-20	13	-144/+180
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Style CI project/build list * return `bs-callout` css class to fix few UI issues * refactor build status helpers * style CI project page (#2545) * style build page by re-using existing UI components * style CI commit page by re-using existing UI components Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1339
\| * \| \| \| \| \| \| \|	Cleanup GitLab CI UIci-build-list	Dmitriy Zaporozhets	2015-09-19	12	-162/+132
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Return callout css for CI	Dmitriy Zaporozhets	2015-09-19	1	-0/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Merge branch 'master' into ci-build-list	Dmitriy Zaporozhets	2015-09-19	40	-387/+109
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| * \| \| \| \| \| \| \|	Add colors to build labels	Dmitriy Zaporozhets	2015-09-18	5	-13/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Merge branch 'master' into ci-build-list	Dmitriy Zaporozhets	2015-09-18	87	-171/+227
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Style CI project/build list	Dmitriy Zaporozhets	2015-09-18	11	-46/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'jwt' into 'master'	Douwe Maan	2015-09-20	2	-4/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed format validation What does this MR do? Removals format validation for drone token Are there points in the code the reviewer needs to double check? Nothing Why was this MR needed? because drone migrated to JWT tokens and JWT token doesn't valid with current format ( i don't know how many symbols JWT can use for this ) See merge request !1359