home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,321 Commits 48 Branches 340 Tags
3d9a7cdb4be6d6d059dfd7ccc8fa2e4bd3ab12e3
Commit Graph
9486 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3d9a7cdb4b Refactor CI helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 16:26:40 +02:00
Dmitriy Zaporozhets 87240e989b Move CI project settings page to CE project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 16:07:44 +02:00
Dmitriy Zaporozhets 2c3355f958 Merge branch 'ci-commits-to-projects' into 'master' 
Make Ci::Commits belong to Project instead of Ci::Project



See merge request !1455
 2015-09-29 11:44:07 +00:00
Kamil Trzcinski 0d877d91e7 Make ensure_gitlab_ci_project return ci_project or create a new one 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 0fa4ab5fd8 Rename commits to ci_commits 2015-09-29 10:47:04 +02:00
Kamil Trzcinski e60647f011 Fix rubocop 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 8f8efcfa00 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 2c1f7ccac8 Fix register_build_service tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 6abca12847 Revert check_enable_flag! changes 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 0e33814708 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 30c78e70cb WIP 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 1530f68c98 WIP 2015-09-29 10:47:03 +02:00
Dmitriy Zaporozhets 2a0d4e7200 Move CI triggers page to project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 10:37:31 +02:00
Dmitriy Zaporozhets 3c997218f6 Merge branch 'projects' into 'master' 
page-title-fix

Fixed .page-title margin

See merge request !1458
 2015-09-29 07:29:07 +00:00
Dmitriy Zaporozhets ada95df88e Merge branch 'move-variables-page' into 'master' 
Move CI variables page to project settings

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

Part of #2594 

See merge request !1457
 2015-09-29 07:28:07 +00:00
Douwe Maan 231ee19c81 Merge branch 'krb_auth_helper_ce' into 'master' 
Remove 'kerberos' from auth_helper.rb for gitlab-CE.

There is no Kerberos auth in gitlab-ce, so it shouldn't be noted
as a form-driven auth mechanism in app/helpers/auth_helper.rb.
This breaks using Kerberos as a custom omniauth provider.
See issue #2510 (https://gitlab.com/gitlab-org/gitlab-ce/issues/2510).

@DouweM suggested I send in this merge request.

See merge request !1430
 2015-09-29 07:27:08 +00:00
Andrey 59582aae57 page-title-fix 2015-09-28 17:58:30 +02:00
Dmitriy Zaporozhets 037defc7de Move CI variables page to project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 17:19:20 +02:00
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 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
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
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
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
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
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
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
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
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
Ben Rosser 7d2655aae7 Remove 'kerberos' from auth_helper.rb for gitlab-CE. 
There is no Kerberos auth in gitlab-ce, so it shouldn't be noted
as a form-driven auth mechanism in app/helpers/auth_helper.rb.
This breaks using Kerberos as a custom omniauth provider.
See issue #2510
 2015-09-24 13:52:20 -04:00
Andrey 1f78c5d460 UI changes to the project view, empty project and project list new project button 2015-09-24 18:36:15 +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
Pavel Forkert 82eeb5e284 Remove stuff from previous UI 2015-09-24 16:38:52 +03:00
Pavel Forkert eb9528b8b9 Move login button to user page, switched to POST method 2015-09-24 16:34:04 +03: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
Pavel Forkert 83347954fc Add option to admin area to sign in as a specific user 
Closes #2291
 2015-09-24 16:14:16 +03:00