home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,251 Commits 48 Branches 340 Tags
3ef71fa4fbea9a5ecc3c094df39cf4ea2f97dc90
Commit Graph
19251 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan-Gerd Tenberge 3ef71fa4fb Add support for HiDPI displays in gravatar service 2015-09-26 20:53:16 +02:00
Stan Hu 4957415e00 Merge pull request #9650 from szechyjs/fb-close-comment 
FogBugz Import: Include closed comments since they may contain user data
 2015-09-25 16:46:50 -07:00
Dmitriy Zaporozhets b623391720 Merge branch 'stanhu/gitlab-ce-fix-mr-creation-with-large-diffs' 2015-09-25 14:08:30 +02:00
Dmitriy Zaporozhets f68acbacd9 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-25 11:15:03 +00:00
Marin Jankovski d0e7498463 Merge branch 'unicorn-listen-8080' into 'master' 
Make sure Unicorn listens on localhost:8080

Some installations from source run into this when upgrading to 8.0.

See merge request !1435
 2015-09-25 10:09:37 +00:00
Stan Hu a44ca15c1d Fix Error 500 in creating merge requests with > 1000 diffs 
Closes #2692
 2015-09-25 02:40:34 -07:00
Dmitriy Zaporozhets 718817fd8f Merge branch 'handle-bad-head' into 'master' 
Fix Error 500 occuring with repositories that have a bad HEAD

A repository could have objects but no valid HEAD, causing `project.commit` to be `nil`.

See merge request !1433
 2015-09-25 09:29:26 +00:00
Jacob Vosmaer 1c9deece3d Make sure Unicorn listens on localhost:8080 2015-09-25 10:59:36 +02:00
Stan Hu bd2991b461 Use after_commit_queue to schedule import job immediately 2015-09-25 01:46:13 -07:00
Stan Hu fbe5bf762d 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 was 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 should delay the worker to ensure the DB has a chance to update.

Closes #2736
 2015-09-25 01:14:54 -07:00
Stan Hu 04de85a994 Fix Error 500 occuring with repositories that have a bad HEAD 
A repository could have objects but no valid HEAD, causing
`project.commit` to be `nil`.
 2015-09-24 22:48:50 -07:00
Stan Hu d5e73ae634 Merge branch 'hook-api-updates' into 'master' 
Hook api updates



See merge request !1429
 2015-09-24 23:28:59 +00:00
Ben Boeckel 869bab9d68 hooks: improve tests for hook API 2015-09-24 16:59:16 -04:00
Robert Speicher 817a60894a 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 19:41:58 +00:00
Robert Schilling 83c9752e04 Merge pull request #9664 from fantasywind/patch-1 
Update 7.14-to-8.0.md
 2015-09-24 20:55:55 +02:00
Kamil Trzcinski 04c4445ae0 Test grace auth against gitlab_ci_project with token 2015-09-24 20:19:27 +02:00
Robert Speicher ce19e1739e Update stub syntax 2015-09-24 14:12:25 -04:00
Robert Speicher 1fef314df2 Merge branch 'update-mailroom' into 'master' 
Update mailroom to 0.5.2

Fixes #2698 and #2711.

See merge request !1424
 2015-09-24 18:09:31 +00:00
Robert Speicher e6655fe417 Merge branch 'newrelic-grape' into 'master' 
Add the newrelic-grape gem

This allows us to see a breakdown of API requests in New Relic.

See merge request !1419
 2015-09-24 17:52:23 +00:00
Robert Speicher ede1ee851a Merge branch 'fix-default-avatar-in-network-graph' into 'master' 
Fix default avatar not showing up in network graph

The change in 71cdb24990 removed the `/assets` path in the default avatar to eliminate runtime errors, but this was one place where `image_path` was missed. If the user full URL is specified, `image_path` does nothing.

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

See merge request !1411
 2015-09-24 17:50:01 +00:00
Robert Speicher 3656c2fa53 Merge branch 'rs-troubleshooting' into 'master' 
Add Troubleshooting section to 8.0 docs

[ci skip]

See merge request !1416
 2015-09-24 17:03:12 +00:00
Robert Speicher 3c8b2cccca Merge branch 'reference-apache-templates-8.0' into 'master' 
Refer to Apache templates in 8.0 update guide

[ci skip]

See merge request !1426
 2015-09-24 17:01:15 +00:00
Robert Speicher 58c21dd77b Update Troubleshooting sections 2015-09-24 12:55:00 -04:00
Ben Boeckel eb912a534b api: add enable_ssl_verification to PUT/POST hooks 2015-09-24 12:34:16 -04:00
Ben Boeckel b07f48d52e doc: list note_events as a valid parameter for PUT/POST hooks 2015-09-24 12:33:58 -04:00
Ben Boeckel 22db4398c6 api: expose note_events and enable_ssl_verification for hooks 2015-09-24 12:33:11 -04:00
Kamil Trzcinski 5d69bc656a Fix grack auth spec 2015-09-24 17:47:57 +02:00
Jacob Vosmaer 040718e106 Refer to Apache templates in 8.0 update guide 2015-09-24 17:47:48 +02:00
Stan Hu 452621208c Fix default avatar not showing up in network graph 
Closes https://github.com/gitlabhq/gitlabhq/issues/9657
 2015-09-24 08:31:18 -07:00
Kamil Trzcinski 297f969bab Fix specs 2015-09-24 16:25:40 +02:00
Douwe Maan c4ca1ad4c3 Merge branch 'remove-ci-dashboard' into 'master' 
Remove CI dashboard

With CI status integrated at GitLab projects page there is no reason to keep it
anymore.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Part of #2594 

See merge request !1422
 2015-09-24 13:53:06 +00:00
Kamil Trzcinski 7545190c8a Remove unneeded change 2015-09-24 15:27:14 +02:00
Kamil Trzcinski 64295a18c5 Get GitLabCiService token from CI project 2015-09-24 15:27:13 +02:00
Douwe Maan f6be2e0d6c Update changelog 2015-09-24 15:15:29 +02:00
Douwe Maan 477017722b Add and document option to use StartTLS with mail_room. 2015-09-24 15:15:25 +02:00
Douwe Maan 29e0a43efe Update mail_room 2015-09-24 15:11:41 +02:00
Dmitriy Zaporozhets 2759b13ae9 Remove CI dashboard 
With CI status integrated at GitLab projects page there is no reason to keep it
anymore.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 15:10:25 +02:00
Dmitriy Zaporozhets 6a32608989 Merge branch 'ci-status-projects-page' into 'master' 
Show CI status on Your projects page and Starred projects page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Part of #2594 

Screenshot: 

![Screenshot_2015-09-24_13.42.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0516ea02b72457a431bd72d3f6619dfe/Screenshot_2015-09-24_13.42.52.png)


See merge request !1420
 2015-09-24 13:09:31 +00:00
Dmitriy Zaporozhets 353d426e4e Show CI status on Your projects page and Starred projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 14:00:23 +02:00
Dmitriy Zaporozhets 3e866b2aa6 Merge branch 'fix-markdown-preview-font' into 'master' 
Use standard Markdown font in Markdown preview instead of fixed-width font

Closes #2585

See merge request !1414
 2015-09-24 11:11:12 +00:00
Dmitriy Zaporozhets f2999fe8f3 Merge branch 'build-status-on-commit-page' into 'master' 
Build status on commit page

Screenshot:

![Screenshot_2015-09-24_11.29.54](https://gitlab.com/gitlab-org/gitlab-ce/uploads/49d1b9dc60d328dceaf771b5e44726ca/Screenshot_2015-09-24_11.29.54.png)

Part of #2594 

See merge request !1418
 2015-09-24 10:36:02 +00:00
Jacob Vosmaer 68f7bc63bc Add the newrelic-grape gem 
This allows us to see a breakdown of API requests in New Relic.
 2015-09-24 12:08:03 +02:00
Dmitriy Zaporozhets fd39414408 Merge branch 'remove-routes-helper' into 'master' 
Fix Slack notification URL and remove the usage of Ci::RoutesHelper

Fix for #2644

/cc @dzaporozhets @rspeicher 

See merge request !1391
 2015-09-24 09:53:04 +00:00
Dmitriy Zaporozhets 2be714dcf6 Show CI status on commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 11:40:48 +02:00
Dmitriy Zaporozhets 9c4307e287 Show CI status on commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 11:21:39 +02:00
Dmitriy Zaporozhets 5faf3e8176 Refactor ci-status badge css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 11:21:10 +02:00
Dmitriy Zaporozhets 081a0ddce7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-24 11:03:32 +02:00
Dmitriy Zaporozhets 24e8445af6 Merge branch 'move-ci-charts' into 'master' 
Move CI charts to project graphs area

Part of #2594 

Should be merged after !1405 


Same page but moved to another place 

![Screenshot_2015-09-23_16.25.15](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef7266de0528bd6dd3f95159e161ea9a/Screenshot_2015-09-23_16.25.15.png)


See merge request !1407
 2015-09-24 09:03:13 +00:00
Job van der Voort 827367ead7 Merge branch 'sshpage-fix' into 'master' 
Made some steps to add SSH keys more clear



See merge request !1936
 2015-09-24 08:48:46 +00:00
Douwe Maan ae3fba6cfa 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 07:51:52 +00:00