summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix links [ci skip]contributing_mdAchilleas Pipinellis2015-12-151-8/+10
|
* Clean up CONTRIBUTING.md [ci skip]Achilleas Pipinellis2015-12-151-113/+254
| | | | | | | * Use 80 chars width where possible * Remove easyfix label reference * Add new issue submission template * Add long links to the bottom of the page
* Clarify what CE and EE means for newcomersAchilleas Pipinellis2015-12-141-1/+6
|
* Merge branch 'feature-proposal' into 'master' Achilleas Pipinellis2015-12-142-14/+52
|\ | | | | | | | | | | | | | | | | update guides for feature proposals on the issue tracker see also #4038 cc @sytses See merge request !2094
| * move up text regarding where to post issuefeature-proposalJob van der Voort2015-12-141-1/+2
| |
| * update guides for feature proposals on the issue trackerJob van der Voort2015-12-142-14/+51
| |
* | Merge branch 'fix-typo-mailing-list' into 'master' Robert Schilling2015-12-141-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix Typo [mailinglist to mailing list] Closes: #4078 See merge request !2098
| * | Fix Typo [mailinglist to mailing list]Mrinal2015-12-141-2/+2
|/ /
* | Update 8.2-to-8.3 guideRobert Speicher2015-12-141-8/+5
| | | | | | | | [ci skip]
* | Merge branch 'add-upgrade-guide-for-8-3' into 'master' Robert Speicher2015-12-141-0/+187
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add upgrade guide for 8.2 to 8.3 Making sure we don't forget mentioning the need to upgrade Redis from !1888. Added this in preparation for 8.3. [ci skip] See merge request !2085
| * | Update gitlab-workhorse and remove mention of gitlab-git-http-serverStan Hu2015-12-141-18/+5
| | | | | | | | | | | | [ci skip]
| * | Rename gitlab-git-http-server mention with gitlab-workhorseStan Hu2015-12-141-1/+1
| | | | | | | | | | | | [ci skip]
| * | Add upgrade guide for 8.2 to 8.3Stan Hu2015-12-141-0/+200
| | | | | | | | | | | | [ci skip]
* | | Prepare Installation doc for 8.3.0-rc1Robert Speicher2015-12-141-34/+39
|/ / | | | | | | [ci skip]
* | Merge branch 'ux/suppress-ci-yml-warning' into 'master' Grzegorz Bizon2015-12-149-39/+104
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Update CHANGELOGux/suppress-ci-yml-warningGrzegorz Bizon2015-12-141-0/+3
| | | | | | | | | | | | [ci skip]
| * | Update commits spinach tests related to displaying build statusGrzegorz Bizon2015-12-142-1/+6
| | |
| * | Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-14233-4628/+2053
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Bizon2015-12-144-4/+43
| | | | | | | | | | | | | | | | Ref #3827
| * | | Add matcher class to ci status linkGrzegorz Bizon2015-12-141-1/+1
| | | |
| * | | Improve gitlab ci commits specs (refactoring)Grzegorz Bizon2015-12-142-35/+39
| | | | | | | | | | | | | | | | | | | | | | | | This minimizes usage of instance variables in this spec, and changes double quotation marks to single when string interpolation is not being used.
| * | | Suppress warning about missing `.gitlab-ci.yml` if builds are disabledGrzegorz Bizon2015-12-141-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | Merge branch 'ci/persist-registration-token' into 'master' Grzegorz Bizon2015-12-1414-27/+158
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Use a new admin runners path when reseting runners tokenGrzegorz Bizon2015-12-142-2/+2
| | | | |
| * | | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-147-7/+11
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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'
* | | | | Merge branch 'move-ci-specs-to-admin-features' into 'master' Kamil Trzciński2015-12-142-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move CI admin builds and runners specs to correct directory [ci skip] /cc @grzesiek See merge request !2095
| * | | | | Move CI admin builds and runners specs to correct directory [ci skip]Kamil Trzcinski2015-12-142-0/+0
|/ / / / /
* | | | | Merge branch 'fix-ci-project-migration' into 'master' Kamil Trzciński2015-12-143-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fix CI project migration and 500 on runners page See merge request !2093
| * | | | Fix 500 when viewing specific runners on runners page [ci skip]Kamil Trzcinski2015-12-142-2/+2
| | | | |
| * | | | Fix Ci::Project migration not migrating columns that cannot be NULL [ci skip]Kamil Trzcinski2015-12-141-3/+3
|/ / / /
* | | | Fix MySQL migration of CI emails [ci skip]Kamil Trzcinski2015-12-141-1/+5
| | | |
* | | | Merge branch 'tweak-flow-merge-when-build-succeeds' into 'master' Douwe Maan2015-12-141-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 Weg2015-12-111-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-tokenGrzegorz Bizon2015-12-14284-5112/+3005
| | |\ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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ński2015-12-14175-2888/+1299
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Trzcinski2015-12-141-1/+1
| | | | |
| * | | | Run builds from projects with enabled CIci-project-migrateKamil Trzcinski2015-12-111-1/+1
| | | | |
| * | | | Use Gitlab::Git instead of Ci::GitKamil Trzcinski2015-12-113-9/+4
| | | | |
| * | | | Fix last specsKamil Trzcinski2015-12-111-1/+1
| | | | |
| * | | | Fix specsKamil Trzcinski2015-12-117-12/+15
| | | | |
| * | | | Fix after column renameKamil Trzcinski2015-12-119-30/+21
| | | | |
| * | | | Fix errorsKamil Trzcinski2015-12-117-10/+5
| | | | |
| * | | | Update badgeKamil Trzcinski2015-12-111-2/+4
| | | | |
| * | | | Finishing touchesKamil Trzcinski2015-12-115-19/+5
| | | | |
| * | | | Fix triggers testsKamil Trzcinski2015-12-113-20/+14
| | | | |
| * | | | Rename columns and rename migrationsKamil Trzcinski2015-12-116-3/+5
| | | | |
| * | | | Reimplement Trigger APIKamil Trzcinski2015-12-116-5/+140
| | | | |
| * | | | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-1133-267/+269
| | | | |
| * | | | Add runners tokenKamil Trzcinski2015-12-1112-29/+23
| | | | |
| * | | | Migrate CI::Project to ProjectKamil Trzcinski2015-12-11161-2660/+972
| | | | |
View Lorry Controller Status