Dmitriy Zaporozhets
a0aa6453bd
Merge branch 'add-links-to-ci' into 'master'
...
Add links from GitLab to CI
* link from dashboard to CI dashboard
* link from project to CI project
Its a fast solution for 8.0. Might be improved in later versions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
See merge request !1313
2015-09-16 16:26:41 +00:00
Dmitriy Zaporozhets
f9dc3a2fb5
Add links from GitLab to CI
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-16 17:54:38 +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
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
fe42de3a48
Fix: features/ci/admin/runners_spec.rb
2015-09-15 22:15:28 +02:00
Kamil Trzcinski
5285e01d54
Fix: features/ci/runners_spec.rb
2015-09-15 21:21:46 +02:00
Jeroen van Baarsen
34e1ce130f
Add a help text to the Slack Service
...
When setting up the service I was not sure which webhook I should use, by adding
this Help text I hope we can help people in the future with setting up this hook
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com >
2015-09-15 20:46:11 +02:00
Valery Sizov
b87ca7500f
fix specs. Stage 7
2015-09-15 17:43:17 +03:00
Dmitriy Zaporozhets
2ed2ef9210
Remove network from CI
2015-09-11 13:38:37 +02:00
Dmitriy Zaporozhets
a8dd4d36e2
Fix build features specs
2015-09-11 12:52:56 +02:00
Stan Hu
9995f0806b
Import forked repositories asynchronously to prevent large repositories from timing out
...
Use import_status to track async import status and give feedback to the user
Closes #2388
Closes #2400
2015-09-11 00:34:04 -07:00
Valery Sizov
6db2843bc2
fix of project creation
2015-09-10 17:54:09 +03:00
Dmitriy Zaporozhets
59c3a3239f
Fix commit specs
2015-09-10 15:52:52 +02:00
Dmitriy Zaporozhets
10b3c85e2c
Fix some issues with ci models specs
2015-09-10 15:47:15 +02:00
Valery Sizov
381180bc27
remove gitlab_ci config
2015-09-10 13:42:41 +03:00
Valery Sizov
44261a5d9f
integration with gitlab auth
2015-09-09 17:36:01 +03:00
Dmitriy Zaporozhets
fefa98b21a
Make rspec start
2015-09-09 15:08:01 +02:00
Dmitriy Zaporozhets
0b5d627cd4
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-09 14:56:02 +02:00
Dmitriy Zaporozhets
b05cc8bc9a
Merge branch 'global_labels' into 'master'
...
Global labels
https://dev.gitlab.org/gitlab/gitlabhq/issues/2353
See merge request !1240
2015-09-09 08:57:54 +00:00
Jared Szechy
e156f42079
FogBugz project import
2015-09-08 20:23:01 -04:00
Stan Hu
d7812a95cf
Re-annotate models
2015-09-06 07:48:48 -07:00
Valery Sizov
f5ffeac058
Create labels in new project
2015-09-03 17:12:15 +03:00
Valery Sizov
57d0013090
CRUD for admin labels
2015-09-03 15:50:23 +03:00
Kirilll Zaitsev
263abda3fd
Drone CI service
2015-09-02 05:52:16 +03:00
Douwe Maan
fe86c8dfbd
Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993
2015-08-29 11:49:14 -07:00
Valery Sizov
ff30b40754
Make all profile public
2015-08-27 13:06:14 +03:00
Douwe Maan
843694f902
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-08-26 17:53:31 -07:00
Douwe Maan
6afd69f444
Update gitignore, change literal DB table names, fix errors, fix fontawesome
2015-08-26 17:47:18 -07:00
Dmitriy Zaporozhets
ef0149dd44
Merge branch 'enable_ssl_verification_web_hook' into 'master'
...
Enable SSL verification for Webhooks
https://dev.gitlab.org/gitlab/gitlabhq/issues/2121
See merge request !1135
2015-08-26 16:06:02 +00:00
Valery Sizov
bafffb2d14
Enable SSL verification for Webhooks
2015-08-26 15:48:31 +03:00
Douwe Maan
046b283127
Groundwork for merging CI into CE
2015-08-25 18:42:46 -07:00
Douwe Maan
e449426a4e
Merge branch 'fix-error-500-groups-with-avatar' into 'master'
...
Fix Error 500 in API when accessing a group that has an avatar
Closes #2340
See merge request !1189
2015-08-24 15:23:10 +00:00
Stan Hu
19f478e00d
Fix Error 500 in API when accessing a group that has an avatar
...
Closes #2340
2015-08-24 07:46:06 -07:00
Valery Sizov
56527b63e8
Ability to search milestones
2015-08-24 13:59:01 +03:00
Robert Speicher
f0bdf7f810
Merge branch 'reply-by-email' into 'master'
...
Reply by email
Fixes #1360 .
It's far from done, but _it works_.
See merge request !1173
2015-08-22 00:00:08 +00:00
Joel Koglin and Joel Koglin
4d2f36118a
Issue #993 : Fixed login failure when extern_uid changes
2015-08-21 09:36:27 -07:00
Dmitriy Zaporozhets
d43d7ffd6f
Merge branch 'hide-recent-push' into 'master'
...
Only show recent push event if the branch still exists or a recent merge request has not been created
Closes #2277
See merge request !1167
2015-08-21 14:54:53 +00:00
Dmitriy Zaporozhets
59525d6b28
Merge branch 'comment-case-insensetive-search' into 'master'
...
Case-insensitive search for comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
See merge request !1174
2015-08-21 14:53:36 +00:00
Douwe Maan
3d51a6d435
Merge branch 'master' into reply-by-email
2015-08-20 12:19:19 -07:00
Artem Sidorenko
55dca86b98
Import sources: settings in the admin interface
2015-08-20 11:28:27 +02:00
Stan Hu
98eb89be5d
Only show recent push event if the branch still exists or a recent merge request has not been created
...
Closes #2277
2015-08-20 01:38:15 -07:00
Douwe Maan
992dbbd9fe
Move sent_notification! out of Notify.
2015-08-19 12:35:23 -07:00
Dmitriy Zaporozhets
b7e6ae03dc
Case-insensetive search for comments
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-19 15:59:48 +02:00
Artem Sidorenko
3ebbed25f0
Allow listing of archived projects
...
Resolves #9285
2015-08-19 13:46:59 +02:00
Dmitriy Zaporozhets
72a425fa66
Merge branch 'remove-satellites'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-19 09:52:39 +02:00
Douwe Maan
8906cabae7
Changes and stuff.
2015-08-18 17:02:26 -07:00
Douwe Maan
f76eac56b9
Reply by email POC
2015-08-18 15:46:36 -07:00
Dmitriy Zaporozhets
798f2fe19f
Merge branch 'mr-source-branch-clear-cache' into 'master'
...
Clear cache to prevent listing deleted branches after MR removes source branch
Closes #2272
See merge request !1160
2015-08-18 13:16:46 +00:00
Dmitriy Zaporozhets
4a0fa27017
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-17 11:41:53 +02:00