Robert Speicher
09bcce7d1f
Merge branch 'ldap-attributes' into 'master'
...
Allow configuration of LDAP attributes GitLab will use for the new user account.
Fixes #2412 .
See merge request !1261
2015-09-16 18:34:55 +00:00
Kamil Trzcinski
2b20603f5a
Make rubocop happy
2015-09-16 17:30:15 +02:00
Kamil Trzcinski
7ea48ec546
Fix CI tests
2015-09-16 17:20:00 +02:00
Kamil Trzcinski
912f470497
Fix ordering issue
2015-09-16 16:59:54 +02:00
Kamil Trzcinski
ac8d2eb065
Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-16 13:34:58 +02:00
Stan Hu
1c289ac0c3
Fix broken sort in merge request API
...
Closes #2266
2015-09-15 22:55:22 -07:00
Kamil Trzcinski
2f2b9f67c2
Fix backup tests
2015-09-16 00:06:41 +02:00
Kamil Trzcinski
416d98b497
Fix: models/ci/project_spec.rb once again
2015-09-15 23:42:57 +02:00
Kamil Trzcinski
2d8c4273ef
Fix models/ci/mail_service_spec.rb
...
- Change Notify to Ci::Notify
- Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
2015-09-15 23:18:52 +02:00
Kamil Trzcinski
757fdd34dc
Revert "Fix: models/ci/mail_service_spec.rb"
...
This reverts commit 345ff6cbf9
2015-09-15 23:09:04 +02:00
Kamil Trzcinski
e21deaee8e
Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
...
# Conflicts:
# Gemfile.lock
2015-09-15 22:40:35 +02:00
Kamil Trzcinski
7e2dbcbe09
Fix: models/ci/project_spec.rb once again
2015-09-15 22:36:25 +02:00
Kamil Trzcinski
0d23676f9d
Fix: rubocop
2015-09-15 22:24:33 +02:00
Kamil Trzcinski
81d98112d4
Fix: tasks/gitlab/backup_rake_spec.rb
2015-09-15 22:21:51 +02:00
Kamil Trzcinski
fe42de3a48
Fix: features/ci/admin/runners_spec.rb
2015-09-15 22:15:28 +02:00
Kamil Trzcinski
29b3279a95
Fix: features/ci/events_spec.rb once again
2015-09-15 22:04:42 +02:00
Kamil Trzcinski
874166d80f
Fix models/ci/web_hook_spec.rb
2015-09-15 22:01:31 +02:00
Kamil Trzcinski
8d5c9935ff
Fix: models/ci/project_spec.rb
2015-09-15 22:00:17 +02:00
Kamil Trzcinski
209c72c4a1
Fix: services/ci/create_project_service_spec.rb
2015-09-15 21:53:04 +02:00
Kamil Trzcinski
345ff6cbf9
Fix: models/ci/mail_service_spec.rb
2015-09-15 21:47:01 +02:00
Kamil Trzcinski
d495e4dff6
Fix: models/ci/build_spec.rb
2015-09-15 21:31:29 +02:00
Kamil Trzcinski
10cf1050d0
Fix: helpers/ci/runners_helper_spec.rb
2015-09-15 21:27:10 +02:00
Kamil Trzcinski
5f315bd565
Fix: helpers/ci/application_helper_spec.rb
2015-09-15 21:24:57 +02:00
Kamil Trzcinski
6cc15cf721
Fix: features/ci/triggers_spec.rb
2015-09-15 21:23:45 +02:00
Kamil Trzcinski
64ef1b3dcd
Fix: features/ci/triggers_spec.rb
2015-09-15 21:22:51 +02:00
Kamil Trzcinski
5285e01d54
Fix: features/ci/runners_spec.rb
2015-09-15 21:21:46 +02:00
Kamil Trzcinski
9621f433a7
Fix: features/ci/projects_spec.rb
2015-09-15 21:06:12 +02:00
Kamil Trzcinski
a598bd91f9
Refactor ci_admin_event and fix features/ci/events_spec.rb
2015-09-15 20:56:20 +02:00
Kamil Trzcinski
6d0980b011
Fix: ci_*_build factory should be valid
2015-09-15 20:51:03 +02:00
Kamil Trzcinski
8549d709fb
Fix ci/projects_controller_spec.rb
2015-09-15 20:40:52 +02:00
Kamil Trzcinski
ed18e04bb3
Cleanup CI backup => migrate with GitLab
2015-09-15 20:14:21 +02:00
Valery Sizov
b87ca7500f
fix specs. Stage 7
2015-09-15 17:43:17 +03:00
Valery Sizov
88b3195ecf
fix specs. Stage 6
2015-09-15 16:29:36 +03:00
Valery Sizov
e2cbb36ba9
fix specs. Stage 5
2015-09-15 15:51:03 +03:00
Valery Sizov
16ba41a186
fix specs. Stage 4
2015-09-15 14:45:59 +03:00
Valery Sizov
22bf844869
fix specs. Stage 3
2015-09-15 13:50:24 +03:00
Dmitriy Zaporozhets
b35d5a6a16
Merge branch 'public_profiles' into 'master'
...
Make all group public
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219#
Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361
See merge request !1247
2015-09-14 15:28:42 +00:00
Valery Sizov
910bf96ec3
fix specs. Stage 2
2015-09-14 18:14:17 +03:00
Dmitriy Zaporozhets
c0c314c6bf
Merge branch 'forked-repo-creation-async' into 'master'
...
Import forked repositories asynchronously to prevent large repositories from timing out
Preserve synchronous mode of adding a repository since some tasks (e.g. restore/check) require the former.
One side bug fix is that the `ProjectCacheWorker` is also run, updating the repository size and commit numbers properly. Previously all the values were set to 0 when a project were forked.
* Closes #2388
* Closes #2400
See merge request !1231
2015-09-14 14:56:13 +00:00
Valery Sizov
2c4daf1a68
fix part of specs
2015-09-14 16:48:33 +03:00
Dmitriy Zaporozhets
db197aa61a
Fix tests and improve wording
2015-09-14 14:16:08 +02:00
Valery Sizov
4c53cc0eba
rubocop satisfy
2015-09-14 14:37:18 +03:00
Dmitriy Zaporozhets
66840f03cc
Fix tests for group access
2015-09-14 12:15:11 +02:00
Dmitriy Zaporozhets
5fcfba2780
Merge branch 'dashboard-titles' into 'master'
...
Clean up overlap between dashboard and explore
- Clean up overlap between dashboard and explore. ... 5d785457260fcd45d92696d3c258e977!1260
2015-09-11 14:36:56 +00:00
Dmitriy Zaporozhets
e3c30bf2e8
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-11 16:32:11 +02:00
Dmitriy Zaporozhets
2ed2ef9210
Remove network from CI
2015-09-11 13:38:37 +02:00
Dmitriy Zaporozhets
187face620
CLeanup CI helpers since we dont use oauth any more
2015-09-11 13:15:18 +02:00
Dmitriy Zaporozhets
ae5d2f5b31
Fix Ci::Ansi2html spec
2015-09-11 13:10:37 +02:00
Dmitriy Zaporozhets
0615de013d
Fix ci commits features specs
2015-09-11 13:05:31 +02:00
Dmitriy Zaporozhets
a8dd4d36e2
Fix build features specs
2015-09-11 12:52:56 +02:00
Robert Speicher
Kamil Trzcinski
Stan Hu
Valery Sizov
Dmitriy Zaporozhets