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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add method complexity check to CIflog	Dmitriy Zaporozhets	2015-11-10	4	-0/+36
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'bump-rugged-version' into 'master'	Dmitriy Zaporozhets	2015-11-10	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Bump rugged version to be in line with gitlab_git requirements See merge request !1780
\| *	Bump charlock_holmes version	Stan Hu	2015-11-10	1	-1/+1
\| \|
\| *	Bump rugged version to be in line with gitlab_git requirements	Stan Hu	2015-11-10	1	-1/+1
\|/
*	Merge branch 'issue_3072_target_name' into 'master'	Dmitriy Zaporozhets	2015-11-10	5	-0/+36
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display target branch on MR list when it is different from project's default Fixes #3072 The screenshot below shows both previous and current UI state: ![branch-mr-both](/uploads/5c1f0519e42bae4655f3eee37edfc356/branch-mr-both.png) First merge request has default branch as a target, second one has non default branch as target. See merge request !1741
\| *	Display target branch on MR list when it is different from project's default	Anton Baklanov	2015-11-10	5	-0/+36
\| \|
* \|	Merge branch 'state-machine-to-state-machines-activerecord' into 'master'	Dmitriy Zaporozhets	2015-11-10	3	-12/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch to state_machines-activerecord (Fixes: #3374) state_machine is unmaintained See merge request !1764
\| * \|	update Gemfile.lock	Pirate Praveen	2015-11-09	1	-2/+8
\| \| \|
\| * \|	remove state_machine_patch.rb	Pirate Praveen	2015-11-09	1	-9/+0
\| \| \|
\| * \|	Switch to state_machines-activerecord (Fixes: #3374)	Pirate Praveen	2015-11-08	2	-2/+2
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/release-notes'	Dmitriy Zaporozhets	2015-11-10	29	-60/+284
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add missing param and title for tagrelease-notes	Dmitriy Zaporozhets	2015-11-09	3	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Refactor release code a bit	Dmitriy Zaporozhets	2015-11-09	5	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Better english	Dmitriy Zaporozhets	2015-11-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add tests to release notes feature	Dmitriy Zaporozhets	2015-11-06	5	-7/+50
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add association and validation for Release model	Dmitriy Zaporozhets	2015-11-06	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Small UI improvements to new git tag page	Dmitriy Zaporozhets	2015-11-06	2	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Fix test	Dmitriy Zaporozhets	2015-11-06	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Fix list rendering issue when dropdown was hidden in row	Dmitriy Zaporozhets	2015-11-06	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Rewrite remove tag test	Dmitriy Zaporozhets	2015-11-06	2	-27/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add changelog item and remove release labels for tags list	Dmitriy Zaporozhets	2015-11-06	2	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Retyle tag show page	Dmitriy Zaporozhets	2015-11-05	1	-14/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Improve UI for tags page	Dmitriy Zaporozhets	2015-11-05	5	-27/+33
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	After tag is created - redirect to tag page	Dmitriy Zaporozhets	2015-11-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add release description to new tag form	Dmitriy Zaporozhets	2015-11-05	3	-1/+28
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Create show page for tag and render release notes there and on index page	Dmitriy Zaporozhets	2015-11-05	9	-20/+47
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add ability to edit and show release notes	Dmitriy Zaporozhets	2015-11-05	7	-9/+60
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	More release related logic to separate resource	Dmitriy Zaporozhets	2015-11-05	8	-11/+46
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add release model	Dmitriy Zaporozhets	2015-11-05	5	-1/+42
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add edit/update tag actions for future release notes	Dmitriy Zaporozhets	2015-11-05	4	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2015-11-10	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change documentation of converting a MySQL-Database to a Postgres one The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904 closes #2904 See merge request !1549
\| * \| \|	Changed documentation of converting a MySQL-Database with Gitlab to a ↵	Tim Jabs	2015-11-04	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Postgresdatatabase. The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904
* \| \| \|	Merge branch 'stanhu/gitlab-ce-bump-gitlab-git-and-other-gems'	Douwe Maan	2015-11-09	3	-19/+19
\|\ \ \ \
\| * \| \| \|	Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3.	Stan Hu	2015-11-09	3	-19/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch back to github-linguist
* \| \| \| \|	Update monthly release issue template	Robert Speicher	2015-11-09	1	-35/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Update CHANGELOG	Robert Speicher	2015-11-09	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-11-09	43	-63/+1727
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'fix-incoming-email-default' into 'master'	Robert Speicher	2015-11-09	2	-2/+3
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incoming email config defaults Fixes #3377. See merge request !1766
\| \| * \| \| \|	Fix incoming email config defaultsfix-incoming-email-default	Douwe Maan	2015-11-09	2	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'accept_mr_btn_ci_status' into 'master'	Dmitriy Zaporozhets	2015-11-09	2	-1/+17
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge button has color from CI status This MR closes #3313 I'am not realy sure about the color for the skipped status (red)... UI changes: ![accpet-mr-ci-failed](/uploads/c03970c468b89e38ed2c5e3171f53505/accpet-mr-ci-failed.png) ![accpet-mr-ci-skipped](/uploads/f29cbc69e77cc95b33522135b327cc51/accpet-mr-ci-skipped.png) ![accpet-mr-ci-pending](/uploads/79612a66fd497174e00bd348c9cba69c/accpet-mr-ci-pending.png) ![accpet-mr-ci-success](/uploads/4b601e6d02b860db5ff53c47c98f3206/accpet-mr-ci-success.png) See merge request !1761
\| \| * \| \| \| \|	Merge button has color from CI status	Baldinof	2015-11-06	2	-1/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Only load rblineprof when actually needed	Yorick Peterse	2015-11-09	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures the application can still boot when the "development" group is not available.
\| * \| \| \| \| \|	Merge branch 'sherlock' into 'master'	Yorick Peterse	2015-11-09	40	-60/+1706
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !1749
\| \| * \| \| \| \| \|	Added changelog entry for Sherlock	Yorick Peterse	2015-11-09	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Truncate transaction paths to 70 characters	Yorick Peterse	2015-11-09	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that long URLs don't completely mess up the layout of the table.
\| \| * \| \| \| \| \|	Track the amount of times views are rendered	Yorick Peterse	2015-11-09	4	-14/+103
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added navigation link to Sherlock	Yorick Peterse	2015-11-09	1	-0/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fixed Hash key style in Sherlock::Query spec	Yorick Peterse	2015-11-09	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Updated profiling guides for Sherlock	Yorick Peterse	2015-11-09	1	-37/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added specs and source documentation for Sherlock	Yorick Peterse	2015-11-09	16	-12/+758
\| \| \| \| \| \| \| \|