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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'ux/suppress-ci-yml-warning' into 'master'	Grzegorz Bizon	2015-12-14	4	-4/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suppress warning about missing `.gitlab-ci.yml` if builds are disabled When user disables GitLab Ci Service in project's settings then warning about missing `.gitlab-ci.yml` file should be supressed. This a matter of user experience as stated in #3761 (closes #3761). cc @ayufan See merge request !2014
\| *	Merge branch 'master' into ux/suppress-ci-yml-warning	Grzegorz Bizon	2015-12-14	132	-2393/+957
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (24 commits) Fix runners admin view Fix migrations Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git Fix last specs Fix specs Fix after column rename Fix errors Update badge Finishing touches Fix triggers tests Rename columns and rename migrations Reimplement Trigger API Remove ci_ prefix from all ci related things Add runners token Migrate CI::Project to Project Fix indentation and BuildsEmailService Change default values Enhance migrate CI emails Fix issue tracker service ... Conflicts: spec/features/commits_spec.rb
\| * \|	Do not display ci build status if builds enabled but no `.gitlab-ci.yml`	Grzegorz Bizon	2015-12-14	3	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \|	Ref #3827
\| * \|	Add matcher class to ci status link	Grzegorz Bizon	2015-12-14	1	-1/+1
\| \| \|
* \| \|	Use a new admin runners path when reseting runners token	Grzegorz Bizon	2015-12-14	1	-1/+1
\| \| \|
* \| \|	Merge branch 'master' into ci/persist-registration-token	Grzegorz Bizon	2015-12-14	3	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Move CI admin builds and runners specs to correct directory Fix 500 when viewing specific runners on runners page Fix Ci::Project migration not migrating columns that cannot be NULL Fix MySQL migration of CI emails Minor fix in flow 'Merge when build succeeds'
\| * \| \|	Fix 500 when viewing specific runners on runners page [ci skip]	Kamil Trzcinski	2015-12-14	2	-2/+2
\| \| \| \|
\| * \| \|	Merge branch 'tweak-flow-merge-when-build-succeeds' into 'master'	Douwe Maan	2015-12-14	1	-1/+1
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor fix in flow 'Merge when build succeeds' When a user, which is not the merge user, want to removes the source branch after the automatic merge this might fail because of checks in the DeleteBranchService /cc @DouweM See merge request !2070
\| \| * \|	Minor fix in flow 'Merge when build succeeds'	Zeger-Jan van de Weg	2015-12-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user, which is not the merge user, want to removes the source branch after the automatic merge this might fail because of checks in the DeleteBranchService
* \| \| \|	Merge branch 'master' into ci/persist-registration-token	Grzegorz Bizon	2015-12-14	164	-2813/+1450
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (66 commits) Fix runners admin view Fix migrations Rename mention of gitlab-git-http-server to gitlab-workhorse Bump Redis requirement to 2.8 for Sidekiq 4 requirements Fix wording on runner setup page add details on how to change saml button label Fix tests Move awards back to gray panel and few improvements to sidebar Few UI improvements to new sidebar implementation Fix tests for new issuable sidebar Update changelog Implement new sidebar for merge request page Make edit link on issuable sidebar works Redesign issue page for new sidebar Move awards css to separate file Implement issuable sidebar partial Update CHANGELOG Clarify cache behavior Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git ... Conflicts: db/schema.rb
\| * \| \|	Merge branch 'ci-project-migrate' into 'master'	Kamil Trzciński	2015-12-14	100	-1388/+613
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
\| \| * \| \|	Fix runners admin view [ci skip]	Kamil Trzcinski	2015-12-14	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Run builds from projects with enabled CIci-project-migrate	Kamil Trzcinski	2015-12-11	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Use Gitlab::Git instead of Ci::Git	Kamil Trzcinski	2015-12-11	2	-4/+4
\| \| \| \| \|
\| \| * \| \|	Fix last specs	Kamil Trzcinski	2015-12-11	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Fix specs	Kamil Trzcinski	2015-12-11	3	-7/+9
\| \| \| \| \|
\| \| * \| \|	Fix after column rename	Kamil Trzcinski	2015-12-11	3	-5/+5
\| \| \| \| \|
\| \| * \| \|	Fix errors	Kamil Trzcinski	2015-12-11	4	-6/+2
\| \| \| \| \|
\| \| * \| \|	Update badge	Kamil Trzcinski	2015-12-11	1	-2/+4
\| \| \| \| \|
\| \| * \| \|	Finishing touches	Kamil Trzcinski	2015-12-11	5	-19/+5
\| \| \| \| \|
\| \| * \| \|	Reimplement Trigger API	Kamil Trzcinski	2015-12-11	2	-5/+7
\| \| \| \| \|
\| \| * \| \|	Remove ci_ prefix from all ci related things	Kamil Trzcinski	2015-12-11	20	-64/+67
\| \| \| \| \|
\| \| * \| \|	Add runners token	Kamil Trzcinski	2015-12-11	4	-16/+11
\| \| \| \| \|
\| \| * \| \|	Migrate CI::Project to Project	Kamil Trzcinski	2015-12-11	95	-1341/+580
\| \| \| \| \|
\| * \| \| \|	Merge branch 'ci-services-migrate' into 'master'	Kamil Trzciński	2015-12-14	43	-1008/+347
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| / \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Ci Services migrate See merge request !1985
\| \| * \|	Fix indentation and BuildsEmailServiceci-services-migrate	Kamil Trzcinski	2015-12-11	2	-6/+5
\| \| \| \|
\| \| * \|	Change default values	Kamil Trzcinski	2015-12-11	5	-11/+29
\| \| \| \|
\| \| * \|	Fix issue tracker service	Kamil Trzcinski	2015-12-10	1	-11/+7
\| \| \| \|
\| \| * \|	Fix specs	Kamil Trzcinski	2015-12-10	1	-0/+1
\| \| \| \|
\| \| * \|	Migrate SlackService and HipChat service	Kamil Trzcinski	2015-12-10	3	-0/+6
\| \| \| \|
\| \| * \|	Migrate CI WebHooks and Emails to new tables	Kamil Trzcinski	2015-12-10	2	-5/+8
\| \| \| \|
\| \| * \|	Migrate CI::Services and CI::WebHooks to Services and WebHooks	Kamil Trzcinski	2015-12-10	43	-1008/+324
\| \| \| \|
\| * \| \|	Merge branch 'improve_emoji'	Valery Sizov	2015-12-14	1	-1/+20
\| \|\ \ \
\| \| * \| \|	Add hover-state for emoji in emoji-pickerimprove_emoji	Valery Sizov	2015-12-11	1	-1/+20
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'fix-shared-runner-wording' into 'master'	Robert Speicher	2015-12-12	1	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wording on "runners" page An attempt to be a bit more specific and clear on the "runners" page. [ci skip] See merge request !2066
\| \| * \| \|	Fix wording on runner setup page	Pelle	2015-12-12	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge pull request #9839 from huacnlee/fix/add-author-info-into-note-messages	Stan Hu	2015-12-11	1	-0/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make sure notify email always has author info.
\| \| * \| \| \|	Make sure notify email always has author info.	Jason Lee	2015-11-18	1	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'ui-right-sidebar' into 'master'	Dmitriy Zaporozhets	2015-12-11	18	-290/+342
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement new sidebar for issue and merge request pages This is first step in implementing #3981. We don't have new dropdowns yet so I used some workarounds. Also I did it from linux machine without having access to design materials. So some colors/paddings might not match - but I will improve it with next iteration. cc @creamzy @JobV See merge request !2058
\| \| * \| \| \| \|	Move awards back to gray panel and few improvements to sidebar	Dmitriy Zaporozhets	2015-12-11	7	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	Few UI improvements to new sidebar implementation	Dmitriy Zaporozhets	2015-12-11	3	-8/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	Fix tests for new issuable sidebar	Dmitriy Zaporozhets	2015-12-11	1	-7/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	Implement new sidebar for merge request page	Dmitriy Zaporozhets	2015-12-11	10	-92/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	Make edit link on issuable sidebar works	Dmitriy Zaporozhets	2015-12-11	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	Redesign issue page for new sidebar	Dmitriy Zaporozhets	2015-12-11	6	-198/+97
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	Move awards css to separate file	Dmitriy Zaporozhets	2015-12-11	1	-0/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	Implement issuable sidebar partial	Dmitriy Zaporozhets	2015-12-11	1	-0/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Merge branch 'fix-typo' into 'master'	Robert Speicher	2015-12-11	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo [ci skip] See merge request !2035
\| \| * \| \| \| \|	Fix typo	Zeger-Jan van de Weg	2015-12-10	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'mr-statuses' into 'master'	Robert Speicher	2015-12-11	6	-1/+59
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display referenced merge request statuses in the issue description See gitlab-org/gitlab-ce#3180 for original issue. Previously discussed in !1941 and in !1771 before that. * [x] Show a "Related Merge Requests" list on the issue page under the Description as given by the UI mockup * [x] Display `all_references.merge_requests` and `note.all_references.merge_requests` * [x] Consider displaying the merge request status in addition to the CI status to enable complete merge request status understanding. See merge request !1991