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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into project-navigation-redesign	Dmitriy Zaporozhets	2016-05-23	43	-143/+483
\|\
\| *	Revert commit info change	Annabel Dunstone	2016-05-23	1	-10/+10
\| \|
\| *	Put column headers back17736-builds-hotfix	Annabel Dunstone	2016-05-23	1	-0/+11
\| \|
\| *	Move build info out of pipeline conditional	Annabel Dunstone	2016-05-23	1	-10/+10
\| \|
\| *	Move tags into column	Annabel Dunstone	2016-05-23	1	-12/+12
\| \|
\| *	Merge branch 'fix-docker-registry-integration' into 'master'	Yorick Peterse	2016-05-21	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix docker registry integration See merge request !4229
\| \| *	Fix container deletion permission issue	Kamil Trzcinski	2016-05-20	1	-1/+1
\| \| \|
\| * \|	Merge branch 'dz-fix-fork-counter' into 'master'	Jacob Schatz	2016-05-21	1	-2/+3
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix fork counter ui bug for safari ## What does this MR do? Fixes UI bug on safari when fork button has blue arrow ## Screenshots ![Screenshot_2016-05-19_22.10.21](/uploads/d923d8fc6bc12ee8f7052390bd5d7c51/Screenshot_2016-05-19_22.10.21.png)![Screenshot_2016-05-19_22.09.38](/uploads/130eb8b4a09b2ba5b7c5a83fed543dbf/Screenshot_2016-05-19_22.09.38.png) See merge request !4221
\| \| *	Fix fork counter ui bug for safaridz-fix-fork-counter	Dmitriy Zaporozhets	2016-05-19	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Merge branch 'zj-gitignore-dropdown'	Douwe Maan	2016-05-20	2	-3/+10
\| \|\ \
\| \| * \|	Dropdown implementationzj-gitignore-dropdown	Alfredo Sumaran	2016-05-20	1	-1/+1
\| \| \| \|
\| \| * \|	Dropdown implementation	Alfredo Sumaran	2016-05-20	1	-3/+1
\| \| \| \|
\| \| * \|	First import of gitignores	Zeger-Jan van de Weg	2016-05-20	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add .gitignore dropdown when creating a new .gitignore file Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
\| \| * \|	Backend for a gitignores dropdown	Zeger-Jan van de Weg	2016-05-20	2	-3/+10
\| \| \|/
\| * \|	Merge branch 'rm-source-branch' into 'master'	Douwe Maan	2016-05-20	3	-5/+9
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows MR authors to have the source branch removed when merging the MR closes #13191 The location of the checkbox might not be optimal so any feedback is welcome. Any other feedback too obviously. Screenshot: ![Screenshot_2016-02-17_21.25.24](/uploads/a9c3eaafb39c6f5b4f0949a2278af6da/Screenshot_2016-02-17_21.25.24.png) See merge request !2801
\| \| * \|	Allows MR authors to have the source branch removed when merging the MR	Jeroen Jacobs	2016-05-20	3	-5/+9
\| \| \|/
\| * \|	Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'	Douwe Maan	2016-05-20	1	-4/+2
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	# Conflicts: # app/services/system_note_service.rb
\| \| *	Create DiffFilter and change SystemNoteService#change_title to use ↵	Adam Butler	2016-05-18	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::Diff::InlineDiff
\| * \|	Merge branch 'feature/runner-config-untagged-jobs' into 'master'	Robert Speicher	2016-05-19	4	-32/+29
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add config for CI Runner that prevents it from picking untagged jobs Closes #3456 See merge request !4039
\| \| * \|	Minor runner-related code refactorings	Grzegorz Bizon	2016-05-19	1	-1/+1
\| \| \| \|
\| \| * \|	Display validation errors when admin edits a runner	Grzegorz Bizon	2016-05-19	1	-1/+1
\| \| \| \|
\| \| * \|	Add minor corrections related to config of runner	Grzegorz Bizon	2016-05-19	2	-3/+2
\| \| \| \|
\| \| * \|	Use form errors helper in CI runner edit form	Grzegorz Bizon	2016-05-19	1	-4/+1
\| \| \| \|
\| \| * \|	Improve displaying validation messages for runner	Grzegorz Bizon	2016-05-19	1	-0/+6
\| \| \| \|
\| \| * \|	Extend runner config options for untagged jobs	Grzegorz Bizon	2016-05-19	2	-32/+21
\| \| \| \|
\| \| * \|	Add form for runner config to run untagged jobs	Grzegorz Bizon	2016-05-19	1	-0/+6
\| \| \| \|
\| * \| \|	Merge branch '17464-backport-email-syntax-highlighting' into 'master'	Douwe Maan	2016-05-19	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Syntax-highlight diffs in push emails ![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png) Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !4147
\| \| * \| \|	Syntax-highlight diffs in push emails17464-backport-email-syntax-highlighting	Sean McGivern	2016-05-17	1	-1/+1
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
\| * \| \|	Merge branch 'with-pipeline-view' into 'master'	Douwe Maan	2016-05-19	16	-77/+294
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pipeline view This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653 cc @DouweM @grzesiek Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625 See merge request !3703
\| \| * \|	Create pipeline objects with parameterswith-pipeline-view	Kamil Trzcinski	2016-05-18	2	-6/+6
\| \| \| \|
\| \| * \|	Use pipelines.errors when communicating the error	Kamil Trzcinski	2016-05-18	1	-5/+2
\| \| \| \|
\| \| * \|	Improve the pipeline box	Kamil Trzcinski	2016-05-16	3	-12/+39
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'origin/master' into with-pipeline-view	Kamil Trzcinski	2016-05-16	17	-133/+126
\| \| \|\ \ \| \| \| \|/
\| \| * \|	Improve design of commit_box with status of builds and pipelines	Kamil Trzcinski	2016-05-16	3	-29/+37
\| \| \| \|
\| \| * \|	Improve the pipelines design	Kamil Trzcinski	2016-05-16	5	-16/+14
\| \| \| \|
\| \| * \|	Fix specs for MySQL	Kamil Trzcinski	2016-05-14	1	-1/+1
\| \| \| \|
\| \| * \|	Revert `stages` change	Kamil Trzcinski	2016-05-14	1	-1/+2
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'origin/master' into with-pipeline-view	Kamil Trzcinski	2016-05-13	10	-61/+46
\| \| \|\ \
\| \| * \| \|	Fix specs	Kamil Trzcinski	2016-05-13	1	-2/+1
\| \| \| \| \|
\| \| * \| \|	Added pipelines spec	Kamil Trzcinski	2016-05-13	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Fix CI tests	Kamil Trzcinski	2016-05-12	2	-4/+5
\| \| \| \| \|
\| \| * \| \|	Use pipeline permissions instead of build	Kamil Trzcinski	2016-05-10	2	-3/+2
\| \| \| \| \|
\| \| * \| \|	Update generic commit status to make it look like a build	Kamil Trzcinski	2016-05-10	2	-23/+19
\| \| \| \| \|
\| \| * \| \|	Improve pipelines design	Kamil Trzcinski	2016-05-10	2	-13/+13
\| \| \| \| \|
\| \| * \| \|	Fix SQL queries for calculating stages status	Kamil Trzcinski	2016-05-10	2	-8/+7
\| \| \| \| \|
\| \| * \| \|	Merge remote-tracking branch 'origin/master' into with-pipeline-view	Kamil Trzcinski	2016-05-09	44	-422/+454
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/ci/builds/_build.html.haml # app/views/projects/commit/_ci_commit.html.haml # app/views/projects/commit/_commit_box.html.haml
\| \| * \| \| \|	Make a build views nicer	Kamil Trzcinski	2016-05-09	4	-33/+60
\| \| \| \| \| \|
\| \| * \| \| \|	Merge remote-tracking branch 'origin/master' into with-pipeline-view	Kamil Trzcinski	2016-04-26	57	-261/+286
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Fix builds rendering bug	Kamil Trzcinski	2016-04-26	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Improve pipeline view	Kamil Trzcinski	2016-04-13	3	-4/+16
\| \| \| \| \| \| \|