home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,264 Commits 48 Branches 340 Tags
74bdd67f2104069e68e0fb7938ae91667d04fc85
Commit Graph
19264 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 74bdd67f21 Update Source Sans Pro font: adds support for cyrillic characters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 11:12:03 +02:00
Dmitriy Zaporozhets ac34ce8648 Merge branch 'add-activity-dashboard-preference' into 'master' 
Add user preference to view project activity and starred project activity as default dashboard

Screenshot:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/5e39fa66da50e01dd9ed1c8a9ce01ea9/image.png)

Closes #2662

See merge request !1446
 2015-09-28 08:23:59 +00:00
Stan Hu e86e87fa71 Merge pull request #9669 from aaronsnyder/admin-labels-grammar 
Fix grammar in admin area labels when no labels exist
 2015-09-26 16:15:47 -07:00
Stan Hu e2016ba367 Merge branch 'patch-1' into 'master' 
Fixed grammar on Using Docker Build doc.



See merge request !1448
 2015-09-26 23:13:10 +00:00
Cyriac Thomas 05f29a5cb3 Simplified sentence as per @stanhu's note 2015-09-26 19:37:55 +00:00
Aaron Snyder a9cfa6c508 Fix grammar in admin area labels .nothing-here-block when no labels exist. 
updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
 2015-09-26 11:25:26 -07:00
Cyriac Thomas 922c635b67 Fixed grammar on Using Docker Build doc. 2015-09-26 18:15:58 +00:00
Stan Hu 0383afc66a Add user preference to view project activity and starred project activity as default dashboard 
Closes #2662
 2015-09-26 08:46:05 -07:00
Stan Hu 6d69181059 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2015-09-25 16:47:33 -07: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
Robert Speicher 9ee96d45a3 Merge branch 'rs-correct-markdown-doc' into 'master' 
Correct an inaccuracy in the Markdown doc

[ci skip]

See merge request !1445
 2015-09-25 21:03:56 +00:00
Robert Speicher 3453b79c9d Correct an inaccuracy in the Markdown doc 
[ci skip]
 2015-09-25 15:44:06 -04:00
Robert Speicher 136fec94bf Merge branch 'rs-changelog' into 'master' 
Add unreleased 8.0.3 entry to CHANGELOG

[ci skip]

See merge request !1440
 2015-09-25 18:08:25 +00:00
Robert Speicher 8f1da76f40 Remove CHANGELOG-CI 
[ci skip]
 2015-09-25 14:05:51 -04:00
Robert Speicher 8a1bc6040b Add unreleased 8.0.3 entry to CHANGELOG 
[ci skip]
 2015-09-25 14:05:25 -04: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