summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 8.0.3v8.0.3Robert Speicher2015-09-281-1/+1
|
* Make sure Unicorn listens on localhost:8080Jacob Vosmaer2015-09-281-0/+13
| | | | [ci skip]
* Fix Error 500 in creating merge requests with > 1000 diffsStan Hu2015-09-282-2/+3
| | | | Closes #2692
* Update CHANGELOGRobert Speicher2015-09-281-14/+3
| | | | [ci skip]
* Merge branch 'fix-stuck-forked-project-import' into 'master' Dmitriy Zaporozhets2015-09-284-2/+25
| | | | | | | | | | | | | | | | | | | Fix bug where projects would appear to be stuck in the forked import state A race condition existed between when Rails committed the `import_status` to `started` and when the Sidekiq worker forked a project. If this fork were quick, it's possible that the worker would attempt to move into the `finished` state before the `started` state took effect. As mentioned in https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting#cannot-find-modelname-with-id12345, we can either delay the worker to ensure the DB has a chance to update, or use the nice `after_commit_queue` gem to schedule the task after the state machine commit. See: * https://github.com/pluginaweek/state_machine/issues/191 * https://github.com/shellycloud/after_commit_queue Closes #2736 See merge request !1434
* Merge branch 'remove-routes-helper' into 'master'Dmitriy Zaporozhets2015-09-285-39/+16
| | | | | | | | Fix Slack notification URL and remove the usage of Ci::RoutesHelper Fix for #2644 See merge request !1391
* Add unreleased 8.0.3 entry to CHANGELOGRobert Speicher2015-09-251-0/+2
| | | | [ci skip]
* Merge branch 'make-checkbox-behaviour-clear' into '8-0-stable' v8.0.2Robert Speicher2015-09-252-3/+4
|\ | | | | | | | | | | | | Make instructions for CI disable checkbox clear. Fix confusion in https://gitlab.com/gitlab-org/gitlab-ce/issues/2663 See merge request !1431
| * I misunderstood how the button worked.Sytse Sijbrandij2015-09-242-3/+3
| |
| * Make instructions for CI disable checkbox clear.Sytse Sijbrandij2015-09-242-3/+4
|/
* Version 8.0.2Robert Speicher2015-09-241-1/+1
|
* Mark 8.0.2 as releasedRobert Speicher2015-09-241-1/+1
| | | | [ci skip]
* Update 7.14-to-8.0.mdChia Yu Pai2015-09-241-0/+1
| | | Add missing path change back
* Merge branch 'get-ci-token-from-ci-projects' into 'master'Robert Speicher2015-09-244-5/+12
| | | | | | | | | Get CI token from ci projects This fixes problem when GitLabCiService had different token than stored in Ci::Project. See merge request !1425
* Refer to Apache templates in 8.0 update guideJacob Vosmaer2015-09-241-0/+2
|
* Merge branch 'update-mailroom' into 'master' Robert Speicher2015-09-245-3/+11
| | | | | | | Update mailroom to 0.5.2 Fixes #2698 and #2711. See merge request !1424
* Add the newrelic-grape gemJacob Vosmaer2015-09-242-3/+5
| | | | This allows us to see a breakdown of API requests in New Relic.
* Merge branch 'rs-troubleshooting' into 'master' Robert Speicher2015-09-242-0/+20
| | | | | | | Add Troubleshooting section to 8.0 docs [ci skip] See merge request !1416
* Merge branch 'rs-help-page' into 'master' Douwe Maan2015-09-243-21/+52
| | | | | | | | | | | | | | | Help page improvements - Only signed-in users can see version information - Add "Community Edition" text so the header is less barren when version information is hidden - Minor copy edits - Make all "Quick help" link text the entire body of the link. Prior, it wasn't obvious which part of each item was an actual link. Closes #2721 See merge request !1415
* Use standard Markdown font in Markdown preview instead of fixed-width fontStan Hu2015-09-242-1/+1
| | | | Closes #2585
* Fix default avatar not showing up in network graphStan Hu2015-09-242-1/+2
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9657
* Remove git refs used internally by GitLab from network graphStan Hu2015-09-243-1/+21
| | | | Closes #2702
* Update CHANGELOGRobert Speicher2015-09-231-0/+1
| | | | [ci skip]
* Fix LDAP attribute mappingDouwe Maan2015-09-232-7/+8
|
* Update CHANGELOGRobert Speicher2015-09-231-0/+1
| | | | [ci skip]
* Merge branch 'rs-sign-in-margin' into 'master' Robert Speicher2015-09-231-1/+1
| | | | | | | | | Fix top margin for sign-in button on public pages Closes #2615 [ci skip] See merge request !1412
* Update CHANGELOGRobert Speicher2015-09-231-1/+3
| | | | [ci skip]
* Make commit graphs responsive to window width changesStan Hu2015-09-232-41/+36
| | | | Closes #2653
* clarify confirmation text on user deletion.Hannes Rosenögger2015-09-231-1/+1
|
* Add unreleased 8.0.2 CHANGELOG entryRobert Speicher2015-09-231-0/+3
|
* Merge branch 'rs-fix-help-links' into 'master' Douwe Maan2015-09-233-6/+7
| | | | | | | Prevent double-prefixing of help page paths Closes #2679 See merge request !1400
* Skip check_initd_configured_correctly on omnibus installsAchilleas Pipinellis2015-09-221-0/+5
| | | | | This was causing the task `gitlab-rake gitlab:incoming_email:check` to fail.
* Fix CI backup step in migration guideRobert Speicher2015-09-221-2/+2
| | | | [ci skip]
* Version 8.0.1v8.0.1Robert Speicher2015-09-221-1/+1
|
* Merge branch 'master' into 8-0-stableRobert Speicher2015-09-224-19/+31
|\
| * Merge branch 'rs-changelog' into 'master' Robert Speicher2015-09-221-1/+4
| |\ | | | | | | | | | | | | | | | | | | 8.0.0 is released; add 8.0.1 entry to CHANGELOG [ci skip] See merge request !1394
| | * 8.0.0 is released; add 8.0.1 entry to CHANGELOGRobert Speicher2015-09-221-1/+4
| |/ | | | | | | [ci skip]
| * Merge branch 'dont_want_the_data' into 'master' Job van der Voort2015-09-221-0/+8
| |\ | | | | | | | | | | | | | | | | | | Add to migration on what to do if you don't want your data. If you don't want to migrate your CI data , remove the old builds directory. See merge request !1392
| | * Add to migration on what to do if you don't want your data.Marin Jankovski2015-09-221-0/+8
| | |
| * | Merge branch 'install-doc-reply-by-email' into 'master' Job van der Voort2015-09-221-13/+17
| |\ \ | | |/ | |/| | | | | | | | | | | | | Mention Reply by email in installation doc. Added the "Enable Reply by email" section and moved the others around. See merge request !1390
| | * Mention Reply by email to installation doc.install-doc-reply-by-emailDouwe Maan2015-09-221-13/+17
| | |
| * | Merge branch 'ci-migration-doc-improvements' into 'master' Marin Jankovski2015-09-221-172/+173
| |\ \ | | |/ | |/| | | | | | | | | | | | | Ci migration doc improvements Use export improvements in CI 8.0.1, make upgrades a more prominent part of the process, do not shut down GitLab during CI data import. See merge request !1387
| | * Make code block comments more verboseci-migration-doc-improvementsJacob Vosmaer2015-09-221-10/+10
| | |
| | * Emphasize when Omnibus installs are doneJacob Vosmaer2015-09-221-1/+1
| | |
| | * Use headings to mark stepsJacob Vosmaer2015-09-221-19/+51
| | |
| | * Add global numberingJacob Vosmaer2015-09-221-3/+3
| | |
| | * Downtime expectationsJacob Vosmaer2015-09-221-1/+4
| | |
| | * Migration only works 8.0 -> 8.0Jacob Vosmaer2015-09-221-1/+3
| | |
| | * More explanation about moving DB secretsJacob Vosmaer2015-09-221-1/+5
| | |
| | * Fix typoJacob Vosmaer2015-09-221-1/+1
| | |