Commit Graph
21589 Commits
Author SHA1 Message Date
Stan Hu 58bb985fe0 Add upgrade guide for 8.2 to 8.3
[ci skip]
2015-12-14 09:21:18 -08:00
Grzegorz Bizon 4526515704 Merge branch 'ux/suppress-ci-yml-warning' into 'master'
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
2015-12-14 17:16:29 +00:00
Grzegorz Bizon 0a81a68158 Update CHANGELOG
[ci skip]
2015-12-14 18:15:11 +01:00
Grzegorz Bizon 3fb89a36cb Merge branch 'ci/persist-registration-token' into 'master'
Persist CI runners registration token

This MR adds feature of persisting CI runners registration token.
User will be able to generate and then reset (if necessary to revoke) this token.

This closes #3703 

cc @ayufan 

See merge request !2039
2015-12-14 13:27:29 +00:00
Grzegorz Bizon 9d2b8326b2 Update commits spinach tests related to displaying build status 2015-12-14 14:25:18 +01:00
Grzegorz Bizon 6586856a15 Use a new admin runners path when reseting runners token 2015-12-14 14:03:58 +01:00
Grzegorz Bizon 76a17d4f54 Merge branch 'master' into ci/persist-registration-token
* 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'
2015-12-14 13:00:25 +00:00
Kamil Trzciński 73ba411af9 Merge branch 'move-ci-specs-to-admin-features' into 'master'
Move CI admin builds and runners specs to correct directory [ci skip]

/cc @grzesiek 

See merge request !2095
2015-12-14 12:08:34 +00:00
Kamil Trzcinski c0ff4fdd99 Move CI admin builds and runners specs to correct directory [ci skip] 2015-12-14 13:06:59 +01:00
Kamil Trzciński 1859b10617 Merge branch 'fix-ci-project-migration' into 'master'
Fix CI project migration and 500 on runners page



See merge request !2093
2015-12-14 11:51:35 +00:00
Kamil Trzcinski cb4b4c5786 Fix 500 when viewing specific runners on runners page [ci skip] 2015-12-14 12:46:26 +01:00
Kamil Trzcinski 927c40ca49 Fix Ci::Project migration not migrating columns that cannot be NULL [ci skip] 2015-12-14 12:31:35 +01:00
Grzegorz Bizon 2ec93abed7 Merge branch 'master' into ci/persist-registration-token
* 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
2015-12-14 12:26:40 +01:00
Grzegorz Bizon 32d83ee79f Merge branch 'master' into ux/suppress-ci-yml-warning
* 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
2015-12-14 12:25:37 +01:00
Kamil Trzcinski 208f99ff6c Fix MySQL migration of CI emails [ci skip] 2015-12-14 12:04:26 +01:00
Douwe Maan 45593d574c Merge branch 'tweak-flow-merge-when-build-succeeds' into 'master'
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
2015-12-14 11:00:44 +00:00
Kamil Trzciński c810234357 Merge branch 'ci-project-migrate' into 'master'
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
2015-12-14 10:35:40 +00:00
Kamil Trzciński e81ae1e68c Merge branch 'ci-services-migrate' into 'master'
Ci Services migrate



See merge request !1985
2015-12-14 10:32:57 +00:00
Kamil Trzcinski baa38f0dc1 Fix runners admin view [ci skip] 2015-12-14 11:30:53 +01:00
Kamil Trzcinski a0c2a7b0cb Fix migrations [ci skip] 2015-12-14 11:30:32 +01:00
Grzegorz Bizon b8f67c5e47 Do not display ci build status if builds enabled but no .gitlab-ci.yml
Ref #3827
2015-12-14 11:28:49 +01:00
Grzegorz Bizon 2dafec91dd Add matcher class to ci status link 2015-12-14 11:03:33 +01:00
Grzegorz Bizon 65fe4bb1ce Improve gitlab ci commits specs (refactoring)
This minimizes usage of instance variables in this spec, and changes
double quotation marks to single when string interpolation is not being
used.
2015-12-14 09:59:08 +01:00
Grzegorz Bizon 00155b6c69 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).
2015-12-14 09:59:08 +01:00
Stan Hu c80f34257d Merge branch 'use-gitlab-workhorse-in-doc' into 'master'
Rename mention of gitlab-git-http-server to gitlab-workhorse

[ci skip]

Closes https://github.com/gitlabhq/gitlabhq/issues/9904

See merge request !2092
2015-12-14 08:21:47 +00:00
Stan Hu 41f5bb035b Rename mention of gitlab-git-http-server to gitlab-workhorse
[ci skip]

Closes https://github.com/gitlabhq/gitlabhq/issues/9904
2015-12-14 00:18:47 -08:00
Valery Sizov 485e910085 Merge branch 'improve_emoji' 2015-12-14 10:10:57 +02:00
Robert Speicher a5e449571b Merge branch 'fix-shared-runner-wording' into 'master'
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
2015-12-12 17:15:37 +00:00
Gabriel Mazetto 10c22d70d8 Merge branch 'requires-redis-2.6' into 'master'
Bump Redis requirement to 2.8 for Sidekiq 4

GitLab Omnibus already uses Redis 2.8. There is also a plan to upgrade to Sidekiq 4, which needs Redis 2.8.

Closes #3649

See merge request !1888
2015-12-12 16:17:48 +00:00
Stan Hu 9c5d8079a3 Bump Redis requirement to 2.8 for Sidekiq 4 requirements
Closes #3649

[ci skip]
2015-12-12 07:51:50 -08:00
Achilleas Pipinellis 2947eda52d Merge branch 'custom-saml-button-label' into 'master'
add details on how to change saml button label

Instructions on how to customize SAML login button text.

See merge request !2079
2015-12-12 12:15:30 +00:00
Pelle 0b60723d1c Fix wording on runner setup page 2015-12-12 09:48:32 +00:00
Stan Hu e8d35ea149 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-11 23:40:58 -08:00
Stan Hu 885bfe3bdc Merge pull request #9839 from huacnlee/fix/add-author-info-into-note-messages
Make sure notify email always has author info.
2015-12-11 23:40:22 -08:00
Ben Bodenmiller e6e27f03d7 add details on how to change saml button label 2015-12-11 23:16:37 +00:00
Achilleas Pipinellis 7dfbf7cf55 Merge branch 'clarify_ci_caching' into 'master'
Clarify cache behavior

After chatting with @ayufan about CI caching, I added some info to the documentation. This should make it clear how caching currently works.

cc/ @ayufan Is this accurate?

See merge request !2072
2015-12-11 22:10:23 +00:00
Dmitriy Zaporozhets 03a5df9974 Merge branch 'ui-right-sidebar' into 'master'
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
2015-12-11 19:30:20 +00:00
Dmitriy Zaporozhets 7cbcc21dcc Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:12:18 +01:00
Dmitriy Zaporozhets 1911811438 Move awards back to gray panel and few improvements to sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:12:18 +01:00
Dmitriy Zaporozhets b4ea6ad16a Few UI improvements to new sidebar implementation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets 617ba01322 Fix tests for new issuable sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets 6117ae98da Update changelog
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets c6c244315a Implement new sidebar for merge request page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets aa5bf4097b Make edit link on issuable sidebar works
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets b0591ff03a Redesign issue page for new sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets 76ff8eac26 Move awards css to separate file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:09:04 +01:00
Dmitriy Zaporozhets f7bba47f8a Implement issuable sidebar partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:09:04 +01:00
Robert Speicher 6738b03902 Merge branch 'fix-typo' into 'master'
Fix typo

[ci skip]

See merge request !2035
2015-12-11 19:08:09 +00:00
Robert Speicher 722f14816c Update CHANGELOG
[ci skip]
2015-12-11 13:27:28 -05:00
Robert Speicher 2bc821301d Merge branch 'mr-statuses' into 'master'
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
2015-12-11 18:25:43 +00:00