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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Version 8.0.0.rc4v8.0.0.rc4	Robert Speicher	2015-09-21	1	-1/+1
\|
*	Merge branch 'master' into 8-0-stable	Robert Speicher	2015-09-21	49	-226/+419
\|\
\| *	Merge branch 'fix-dangling-milestone-ids' into 'master'	Stan Hu	2015-09-21	1	-0/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deleted milestones from merge requests This is related to !1348 but thought it would be useful as a separate MR. This MR removes deleted milestone IDs from any merge request. Closes https://github.com/gitlabhq/gitlabhq/issues/9643 See merge request !1350
\| \| *	Remove deleted milestones from merge requests	Stan Hu	2015-09-21	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9643
\| * \|	Merge branch 'rs-relative-link-up-one' into 'master'	Robert Speicher	2015-09-21	2	-15/+51
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow relative links to go up one directory level See merge request !1352
\| \| * \|	Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-one	Robert Speicher	2015-09-20	2	-2/+9
\| \| \| \|
\| \| * \|	Allow relative links to go up one directory level	Robert Speicher	2015-09-18	2	-15/+44
\| \| \| \|
\| * \| \|	Merge branch 'rename-reply-by-email' into 'master'	Robert Speicher	2015-09-21	17	-175/+150
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename reply_by_email to incoming_email to prepare for the future. Closes #2579. See merge request !1367
\| \| * \| \|	Tweak textrename-reply-by-email	Douwe Maan	2015-09-21	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \|	Merge branch 'master' into rename-reply-by-email	Douwe Maan	2015-09-21	20	-84/+266
\| \| \|\ \ \
\| \| * \| \| \|	Rename reply_by_email to incoming_email to prepare for the future.	Douwe Maan	2015-09-21	17	-175/+151
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'ci-import-improvements' into 'master'	Kamil Trzciński	2015-09-21	2	-2/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI import improvements See merge request !1369
\| \| * \| \| \| \|	Relax CI version check during importci-import-improvements	Jacob Vosmaer	2015-09-21	1	-1/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Make importing builds less noisy	Jacob Vosmaer	2015-09-21	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'fix-ci-handling' into 'master'	Dmitriy Zaporozhets	2015-09-21	2	-3/+8
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed MR handling when GitLab CI project is not present This is copy of !1371 /cc @jacobvosmaer @vsizov @dzaporozhets See merge request !1373
\| \| * \| \| \| \| \|	Fixed MR handling when GitLab CI project is not presentfix-ci-handling	Kamil Trzcinski	2015-09-21	2	-3/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix-note-edit-preview-css' into 'master'	Robert Speicher	2015-09-21	4	-3/+7
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More tweaks to make note edit/preview CSS consistent Closes #2585 See merge request !1378
\| \| * \| \| \| \| \| \|	More tweaks to make note edit/preview CSS consistent	Stan Hu	2015-09-21	4	-3/+7
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2585
\| * \| \| \| \| \| \|	Merge branch 'fix-mr-without-refs' into 'master'	Dmitriy Zaporozhets	2015-09-21	2	-1/+20
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch merge request ref if it is missing when visit MR page This will fix merge problem for merge requests between forks created before 8.0 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Needed for 8.0 Fixes #2580 See merge request !1377
\| \| * \| \| \| \| \| \|	Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refs	Dmitriy Zaporozhets	2015-09-21	2	-1/+20
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will fix merge problem for merge requests between forks created before 8.0 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Fix grammar	Sytse Sijbrandij	2015-09-21	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix-milestone-destroy-in-mr' into 'master'	Dmitriy Zaporozhets	2015-09-21	3	-0/+12
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove milestones from merge requests when milestones are deleted Destroying a milestone does not remove it from existing merge requests. This MR fixes that. Requires f4816372 to pull in as well. Reported by https://github.com/gitlabhq/gitlabhq/issues/9643 See merge request !1348
\| \| * \| \| \| \| \| \|	Remove milestones from merge requests when milestones are deleted	Stan Hu	2015-09-21	3	-0/+12
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
\| * \| \| \| \| \| \|	Merge branch 'repo-size-link' into 'master'	Dmitriy Zaporozhets	2015-09-21	2	-3/+3
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link project repo size to files See merge request !1374
\| \| * \| \| \| \| \| \|	Link project repo size to filesrepo-size-link	Douwe Maan	2015-09-21	2	-3/+3
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'remove-project-panel-ci-button' into 'master'	Dmitriy Zaporozhets	2015-09-21	1	-4/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove CI button from project home panel Since we already have a "Continuous Integration" item in the sidebar now, I don't think we need "CI" on the project page. See merge request !1372
\| \| * \| \| \| \| \| \|	Remove CI button from project home panelremove-project-panel-ci-button	Douwe Maan	2015-09-21	1	-4/+0
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch 'ci-nav-fw' into 'master'	Dmitriy Zaporozhets	2015-09-21	2	-14/+14
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use fixed-width icons in CI nav sidebar. See merge request !1376
\| \| * \| \| \| \| \| \|	Use fixed-width icons in CI nav sidebar.ci-nav-fw	Douwe Maan	2015-09-21	2	-14/+14
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch 'ci-nav-commits-count' into 'master'	Dmitriy Zaporozhets	2015-09-21	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use consistent styling for number of commits in CI nav sidebar Before: ![Screen_Shot_2015-09-21_at_15.00.28](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9005f606842936d415a3b67890b8af88/Screen_Shot_2015-09-21_at_15.00.28.png) After: ![Screen_Shot_2015-09-21_at_15.00.43](https://gitlab.com/gitlab-org/gitlab-ce/uploads/08c897b65f82fab5f2c386a0d21c64af/Screen_Shot_2015-09-21_at_15.00.43.png) See merge request !1375
\| \| * \| \| \| \| \|	Use consistent styling for number of commits in CI nav sidebarci-nav-commits-count	Douwe Maan	2015-09-21	1	-1/+1
\| \| \|/ / / / /
\| * \| \| \| \| \|	Revert "Fixed MR handling when GitLab CI project is not present"	Kamil Trzcinski	2015-09-21	2	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3abcab779ec3015914eda5d715b4a9588445d815.
\| * \| \| \| \| \|	Fixed MR handling when GitLab CI project is not present	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
\| \| \| \| \| \| \| \| \|