19182 Commits
Author SHA1 Message Date
Robert Speicher f96e86ad1e Version 8.0.3 v8.0.3 2015-09-28 23:21:41 -04:00
Jacob VosmaerandRobert Speicher f55e74235c Make sure Unicorn listens on localhost:8080
[ci skip]
2015-09-28 22:52:55 -04:00
Stan HuandRobert Speicher 9683d1ef1f Fix Error 500 in creating merge requests with > 1000 diffs
Closes #2692
2015-09-28 22:44:53 -04:00
Robert Speicher 1c8c7b3738 Update CHANGELOG
[ci skip]
2015-09-28 22:43:35 -04:00
Dmitriy ZaporozhetsandRobert Speicher df1a235f23 Merge branch 'fix-stuck-forked-project-import' into 'master'
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
2015-09-28 22:42:18 -04:00
Dmitriy ZaporozhetsandRobert Speicher 6249459cfd Merge branch 'remove-routes-helper' into 'master'
Fix Slack notification URL and remove the usage of Ci::RoutesHelper

Fix for #2644

See merge request !1391
2015-09-28 22:40:59 -04:00
Robert Speicher 8e1ee9715b Add unreleased 8.0.3 entry to CHANGELOG
[ci skip]
2015-09-25 14:12:32 -04:00
Robert Speicher 3df6c44eae Merge branch 'make-checkbox-behaviour-clear' into '8-0-stable'
Make instructions for CI disable checkbox clear.

Fix confusion in https://gitlab.com/gitlab-org/gitlab-ce/issues/2663

See merge request !1431
v8.0.2
2015-09-25 00:12:52 +00:00
Sytse Sijbrandij 41bb994836 I misunderstood how the button worked. 2015-09-24 16:07:22 -07:00
Sytse Sijbrandij 4d287c8c15 Make instructions for CI disable checkbox clear. 2015-09-24 15:53:50 -07:00
Robert Speicher 834678f39b Version 8.0.2 2015-09-24 16:19:15 -04:00
Robert Speicher 359f057c0e Mark 8.0.2 as released
[ci skip]
2015-09-24 15:56:18 -04:00
Chia Yu PaiandRobert Speicher 3e0372289e Update 7.14-to-8.0.md
Add missing path change back
2015-09-24 15:51:09 -04:00
Robert SpeicherandRobert Speicher 199448781a Merge branch 'get-ci-token-from-ci-projects' into 'master'
Get CI token from ci projects

This fixes problem when GitLabCiService had different token than stored
in Ci::Project.

See merge request !1425
2015-09-24 15:49:43 -04:00
Jacob VosmaerandRobert Speicher 3334d16477 Refer to Apache templates in 8.0 update guide 2015-09-24 14:32:01 -04:00
Robert SpeicherandRobert Speicher 432dc45e3a Merge branch 'update-mailroom' into 'master'
Update mailroom to 0.5.2

Fixes #2698 and #2711.

See merge request !1424
2015-09-24 14:30:50 -04:00
Jacob VosmaerandRobert Speicher fa51db0700 Add the newrelic-grape gem
This allows us to see a breakdown of API requests in New Relic.
2015-09-24 14:29:09 -04:00
Robert SpeicherandRobert Speicher bd859cd851 Merge branch 'rs-troubleshooting' into 'master'
Add Troubleshooting section to 8.0 docs

[ci skip]

See merge request !1416
2015-09-24 14:27:53 -04:00
Douwe MaanandRobert Speicher 55d771104c Merge branch 'rs-help-page' into 'master'
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
2015-09-24 14:26:12 -04:00
Stan HuandRobert Speicher ae51989e19 Use standard Markdown font in Markdown preview instead of fixed-width font
Closes #2585
2015-09-24 14:25:08 -04:00
Stan HuandRobert Speicher 222ededa34 Fix default avatar not showing up in network graph
Closes https://github.com/gitlabhq/gitlabhq/issues/9657
2015-09-24 14:24:05 -04:00
Stan HuandRobert Speicher 5f0983b207 Remove git refs used internally by GitLab from network graph
Closes #2702
2015-09-24 14:21:20 -04:00
Robert Speicher 6dd5b1cc36 Update CHANGELOG
[ci skip]
2015-09-23 13:31:18 -04:00
Douwe MaanandRobert Speicher db29ef3a8b Fix LDAP attribute mapping 2015-09-23 13:30:22 -04:00
Robert Speicher 8ba96d3c1f Update CHANGELOG
[ci skip]
2015-09-23 13:03:41 -04:00
Robert SpeicherandRobert Speicher 8a973a12a8 Merge branch 'rs-sign-in-margin' into 'master'
Fix top margin for sign-in button on public pages

Closes #2615

[ci skip]

See merge request !1412
2015-09-23 13:03:25 -04:00
Robert Speicher cb8d9eec17 Update CHANGELOG
[ci skip]
2015-09-23 12:39:05 -04:00
Stan HuandRobert Speicher 7bf3a90ac2 Make commit graphs responsive to window width changes
Closes #2653
2015-09-23 12:33:11 -04:00
Hannes RosenöggerandRobert Speicher bfc4138071 clarify confirmation text on user deletion. 2015-09-23 12:25:52 -04:00
Robert Speicher e6a9bd8250 Add unreleased 8.0.2 CHANGELOG entry 2015-09-23 12:24:00 -04:00
Douwe MaanandRobert Speicher e8c144af51 Merge branch 'rs-fix-help-links' into 'master'
Prevent double-prefixing of help page paths

Closes #2679 

See merge request !1400
2015-09-23 12:23:26 -04:00
Achilleas PipinellisandRobert Speicher 9911f86c3d Skip check_initd_configured_correctly on omnibus installs
This was causing the task `gitlab-rake gitlab:incoming_email:check`
to fail.
2015-09-22 17:00:47 -04:00
Robert Speicher 73df99f700 Fix CI backup step in migration guide
[ci skip]
2015-09-22 16:34:08 -04:00
Robert Speicher 8fa03bbe12 Version 8.0.1 v8.0.1 2015-09-22 13:17:50 -04:00
Robert Speicher fba9f34c7a Merge branch 'master' into 8-0-stable 2015-09-22 12:38:01 -04:00
Robert Speicher 9e1392553b Merge branch 'rs-changelog' into 'master'
8.0.0 is released; add 8.0.1 entry to CHANGELOG

[ci skip]

See merge request !1394
2015-09-22 16:32:20 +00:00
Robert Speicher 2cdd88e8ed 8.0.0 is released; add 8.0.1 entry to CHANGELOG
[ci skip]
2015-09-22 12:29:55 -04:00
Robert Speicher b907d5180e Add 8.0.1 to CHANGELOG 2015-09-22 12:26:41 -04:00
Job van der VoortandMarin Jankovski f03a33cb50 Merge branch 'dont_want_the_data' into 'master'
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
2015-09-22 17:29:14 +02:00
Job van der Voort 70875a6aba Merge branch 'dont_want_the_data' into 'master'
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
2015-09-22 15:04:08 +00:00
Marin Jankovski e2be419c95 Add to migration on what to do if you don't want your data. 2015-09-22 16:57:43 +02:00
Job van der Voort 555c197643 Merge branch 'install-doc-reply-by-email' into 'master'
Mention Reply by email in installation doc.

Added the "Enable Reply by email" section and moved the others around.

See merge request !1390
2015-09-22 14:28:50 +00:00
Marin JankovskiandMarin Jankovski a65aa45f59 Merge branch 'ci-migration-doc-improvements' into 'master'
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
2015-09-22 16:14:20 +02:00
Marin Jankovski 398092273b Merge branch 'ci-migration-doc-improvements' into 'master'
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
2015-09-22 14:10:24 +00:00
Douwe Maan a1b60003f0 Mention Reply by email to installation doc. 2015-09-22 15:36:40 +02:00
Jacob Vosmaer d2ab95d1f3 Make code block comments more verbose 2015-09-22 15:26:40 +02:00
Jacob Vosmaer 3e926c6eb0 Emphasize when Omnibus installs are done 2015-09-22 14:54:26 +02:00
Jacob Vosmaer 82d95c4612 Use headings to mark steps 2015-09-22 14:49:39 +02:00
Jacob Vosmaer f0f5be82b0 Add global numbering 2015-09-22 14:02:36 +02:00
Jacob Vosmaer e72ba928f9 Downtime expectations 2015-09-22 13:59:40 +02:00