home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 04:36:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,205 Commits 48 Branches 340 Tags
8-0-stable
Commit Graph
19205 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 05692ae1e6 Merge pull request #9760 from gitlabhq/revert-9758-fix/api-helpers-bad-autoload-name 
Revert "Rename API::APIHelpers -> API::Helpers;"
 2015-10-22 19:47:25 +02:00
Dmitriy Zaporozhets 49e48bd055 Revert "Rename API::APIHelpers -> API::Helpers;" 2015-10-22 19:47:09 +02:00
Dmitriy Zaporozhets 7ea9adfa8a Merge pull request #9758 from huacnlee/fix/api-helpers-bad-autoload-name 
Rename API::APIHelpers -> API::Helpers;
 2015-10-22 19:07:31 +02:00
Jason Lee eb1bd4e47a Fix API::APIHelpers -> API::Helpers; 
Rails Autoload find file to require is use , APIHelpers -> api_helpers.rb, not helpers.rb;
 2015-10-22 17:16:51 +08:00
Robert Speicher 2c036674c4 Update CHANGELOG 
[ci skip]
 2015-10-16 16:33:04 -04:00
Jacob VosmaerandRobert Speicher d3bbb27532 Track compatible gitlab-git-http-server version 2015-10-16 16:22:31 -04:00
Robert Speicher e1777f4b8b Prevent a JS error in MergeRequestTabs 
When `window.location.hash` is pointing to a note, e.g. `#note_1234`,
`scrollToElement` would throw an error because a selector such as
`.commits #note_1234` doesn't exist, so `offset()` returned `undefined`.

This error would prevent subsequent calls from running, which caused the
loading spinner to never be hidden.

Now we ensure the selector returns a valid element before trying to
scroll to it.
 2015-10-16 16:22:06 -04:00
Robert Speicher 2866c501b5 Version 8.0.5 v8.0.5 2015-10-14 01:54:45 -04:00
Robert Speicher 03e4476421 Update CHANGELOG for 8.0.5 
[ci skip]
 2015-10-11 19:53:12 -04:00
Robert Speicher e13333aa1d Make the loading spinner toggle more explicit 
Occasionally the loading spinner would stay visible after the tab
finished loading. This change makes the toggle explicit so that it's
always shown on `beforeSend`, and always hidden on `complete`.

Plus a bonus semi-colon eradication! 💥
 2015-10-11 19:23:48 -04:00
Drew BlessingandRobert Speicher ada2c45528 Fix ldap email downcasing bug 2015-10-11 19:21:43 -04:00
Douwe MaanandRobert Speicher 567403b42a Clarify Reply by email settings when using Postfix mail server 2015-10-11 19:17:11 -04:00
Robert Speicher 1ff385dc38 Version 8.0.4 v8.0.4 2015-10-05 21:12:54 -04:00
Robert Speicher 2fa83fb729 Update CHANGELOG 2015-10-05 14:09:02 -04:00
Dmitriy ZaporozhetsandRobert Speicher 67fec8b394 Fix admin runner page -> assign all button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-05 14:06:45 -04:00
Kamil TrzcinskiandRobert Speicher 38b0bd31e3 Fix: CI token removal regression from build trace 2015-10-05 14:06:29 -04:00
Valery SizovandRobert Speicher 9a26120c71 Fix anchors to comments in diffs 2015-10-05 14:03:27 -04:00
Geoffrey ChallenandRobert Speicher b4963a75df Fix referals for :back and relative URL installs. 2015-10-05 14:02:10 -04:00
Robert SpeicherandRobert Speicher 28bf9824bc Merge branch 'reply-by-email-known-issue' into 'master' 
Document known issue with Reply by email and multiple application servers.

See merge request !1499
 2015-10-05 14:00:48 -04:00
Jacob VosmaerandRobert Speicher ea554f92c0 Golang download instructions assume amd64 2015-10-05 13:59:38 -04:00
Stan HuandRobert Speicher 11cc2cd221 Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being dropped 
Closes #2867
 2015-10-05 13:58:43 -04:00
Robert SpeicherandRobert Speicher f9a0c22d26 Merge branch 'golang-ruby-versions' into 'master' 
Bump Ruby and Golang versions

[ci skip]

See merge request !1467
 2015-09-30 12:19:42 -04:00
Jacob VosmaerandRobert Speicher fbecf7aef4 Apache needs gitlab-git-http-server on TCP 
[ci skip]
 2015-09-30 12:19:01 -04:00
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