home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,196 Commits 48 Branches 340 Tags
e13333aa1df472aee467d4a751b5fd7eb6156498
Commit Graph
664 Commits
Author SHA1 Message Date
Kamil TrzcinskiandRobert Speicher 38b0bd31e3 Fix: CI token removal regression from build trace 2015-10-05 14:06:29 -04:00
Dmitriy ZaporozhetsandRobert Speicher 6249459cfd Merge branch 'remove-routes-helper' into 'master' 
Fix Slack notification URL and remove the usage of Ci::RoutesHelper

Fix for #2644

See merge request !1391
 2015-09-28 22:40:59 -04:00
Robert Speicher 2f88459297 Ensure raise_error expectations provide arguments 2015-09-21 15:35:29 -04:00
Douwe Maan 9be1c08e5d Merge branch 'jwt' into 'master' 
Removed format validation

**What does this MR do?**

Removals format validation for drone token

**Are there points in the code the reviewer needs to double check?**

Nothing

**Why was this MR needed?**

because drone migrated to JWT tokens and JWT token doesn't valid with current format ( i don't know how many symbols JWT can use for this )

See merge request !1359
 2015-09-20 15:19:33 +00:00
Robert Speicher 69723d2002 Devise 3.5.x deprecates confirm! in favor of confirm 2015-09-19 21:15:13 -04:00
Kirilll Zaitsev 9021200ad3 Removed format validation 2015-09-19 14:12:20 +03:00
Valery SizovandKamil Trzcinski a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02:00
Valery Sizov 600d6eeff3 Fix CI status in the MR page 2015-09-18 18:02:29 +03:00
Jungkook Park e4ac2d582c add repository field to issue hook data 
add a test for to_hook_data of issue model

update CHANGELOG
 2015-09-17 05:33:37 +09: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 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.

This requires sidekiq >= 3.4 and fixed all other CE tests
 2015-09-15 23:09:04 +02:00
Kamil Trzcinski 7e2dbcbe09 Fix: models/ci/project_spec.rb once again 2015-09-15 22:36:25 +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 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
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 4c53cc0eba rubocop satisfy 2015-09-14 14:37:18 +03:00
Dmitriy Zaporozhets 2ed2ef9210 Remove network from CI 2015-09-11 13:38:37 +02:00
Dmitriy Zaporozhets 9a9417ee8e Fix more tests 2015-09-10 18:12:14 +02:00
Dmitriy Zaporozhets bf8013f1a4 Fix most of project specs 2015-09-10 15:56:33 +02: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 44261a5d9f integration with gitlab auth 2015-09-09 17:36:01 +03: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 cc4ef4da11 Refactor CI tests 2015-09-09 14:17:16 +02:00
Stan Hu d7812a95cf Re-annotate models 2015-09-06 07:48:48 -07:00
Kirilll Zaitsev 263abda3fd Drone CI service 2015-09-02 05:52:16 +03: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
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
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
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
Boyan Tabakov 88ab815b38 Update Flowdock integration to support new Flowdock API 
Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
 2015-08-14 16:45:23 +02:00
Dmitriy Zaporozhets 00a33d67aa Merge branch 'improve-hipchat-service-test' into 'master' 
Provide more feedback what went wrong if HipChat service failed test

This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks.

Screenshot:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/10f82eb02db138f9680e69cdb3d3ed82/image.png)

Issue gitlab-com/support-forum#213

See merge request !1144
 2015-08-13 11:43:44 +00:00
Stan Hu 2379057002 Provide more feedback what went wrong if HipChat service failed test 
Issue gitlab-com/support-forum#213
 2015-08-12 07:31:25 -07:00
Florent (HP) 8adf6ba8f5 Add merged label on branches page 2015-08-11 23:00:46 +02:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 32046983ad Revert "Merge branch 'refactor-can-be-merge' into 'master'" 
This reverts commit 459e6d3467, reversing
changes made to 804168e1de.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:48:02 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Robert Speicher fb6dc1f07d Add Group#add_* convenience methods 
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
 2015-08-07 00:20:02 -04:00
Dmitriy Zaporozhets dcb0bf0df5 Merge branch 'report-spam' 2015-08-06 18:07:36 +02:00
Dmitriy Zaporozhets cba7f20dc8 Allow users to send abuse reports 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 14:03:27 +02:00
Douwe Maan c6cbee846c Merge branch 'remove-email-from-published-keys' into 'master' 
Only publish ssh key-type and key

Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys)

To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded.

See merge request !850
 2015-08-06 09:05:15 +00:00
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00