home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets b656419591 Merge branch 'move-runners-page' 2015-09-28 16:47:18 +02:00
Dmitriy Zaporozhets d8e631c1e5 Merge branch 'cyrillic-font' into 'master' 
Update Source Sans Pro font: adds support for cyrillic characters

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

Fixes #2764

See merge request !1454
 2015-09-28 14:20:28 +00:00
Douwe Maan 10c036fcf5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-28 15:43:27 +02:00
Douwe Maan 1c1c7e1abd Merge branch 'fxposter/gitlab-ce-login-from-admin' 2015-09-28 15:43:02 +02:00
Dmitriy Zaporozhets 145d933880 Merge branch 'projects' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 13:42:41 +02:00
Andrey ad67912760 !important removed from pre 2015-09-28 12:03:41 +02:00
Andrey ce49e49bfb edit action allign 2015-09-28 11:26:42 +02:00
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 c876bfa0f2 Add missing spec file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 11:01:45 +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
Dmitriy Zaporozhets 92f8e0fd7e Finish move of runners page to project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 10:14:53 +02:00
fscherwi 436ab6d3ed change build status image to svg [ci skip] 2015-09-27 12:47:12 +02: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
Jan-Gerd Tenberge 8d620e39c9 Add scale argument in user class 2015-09-26 21:51:02 +02:00
Cyriac Thomas 05f29a5cb3 Simplified sentence as per @stanhu's note 2015-09-26 19:37:55 +00:00
Jan-Gerd Tenberge f93177c6a3 Add scale parameter to helper 2015-09-26 21:25:04 +02:00
Jan-Gerd Tenberge 3ef71fa4fb Add support for HiDPI displays in gravatar service 2015-09-26 20:53:16 +02: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
Andrey 12acf15c90 Project page Update 
refactoring buttons, fixes for projects filter on the dashboard and
group page
 2015-09-25 20:33:05 +02: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
Jacob Vosmaer 4dd7c2f1e0 Remove unwanted linebreak 2015-09-25 18:35:41 +02:00
Jacob Vosmaer 9f3984b5e8 Rename doc file 2015-09-25 18:32:51 +02:00
Jacob Vosmaer 5bcd0efe3e Add parallel-rsync-repos script and start docs 2015-09-25 18:32:02 +02:00
Paul Beattie 253d2320ab Add support for AWS S3 Server-Side Encryption support 
This adds support for AWS S3 SSE with S3 managed keys, this means the
data is encrypted at rest and the encryption is handled transparently to
the end user as well as in the AWS Console. This is optional and not
required to make S3 uploads work.
 2015-09-25 17:06:31 +01:00
Dmitriy Zaporozhets b328c76c06 Move runners page to project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-25 18:03:41 +02:00
Dmitriy Zaporozhets 352f242d8c Fix admin runner page -> assign all button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-25 17:46:03 +02:00
Jacob Vosmaer 7a8a892efd Add "rake gitlab:list_repos" task 2015-09-25 17:12:41 +02:00
Jacob Vosmaer 6055c507cc Fix path to /etc/default/gitlab in 8.0 update guide 2015-09-25 15:40:44 +02:00
Jacob Vosmaer 255d5f7501 Improve 'rake gitlab:cleanup:repos' documentation 2015-09-25 14:38:42 +02: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
Dmitriy Zaporozhets 1868c8b258 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-25 10:04:09 +02: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