3ebbed25f0
Allow listing of archived projects
...
Resolves #9285
2015-08-19 13:46:59 +02:00
72a425fa66
Merge branch 'remove-satellites'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 09:52:39 +02:00
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
4a0fa27017
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +02:00
e02cff19ed
Fix typo in text when raise pre-receive exception
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 10:47:29 +02:00
3b93856e13
save repo empty state into variable for proper result
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 10:24:25 +02:00
9ea37cda3f
merge with support of pre-receive and post-receive hooks
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 17:52:49 +02:00
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
f4149bcddc
Refactor how repository makes commit with pre/post receive hooks
2015-08-14 16:23:40 +02:00
6e808fc222
Clear cache to prevent listing deleted branches after MR removes source branch
...
Closes #2272
2015-08-14 07:09:25 -07:00
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:
Issue gitlab-com/support-forum#213
See merge request !1144
2015-08-13 11:43:44 +00:00
34690142bf
Implement commit transaction with pre-receive and post-receive hooks for web editor
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-13 12:57:24 +02:00
95f8f7c729
api: add 'system', 'upvote', and 'downvote' fields to note queries
...
This reverts commit 4c586dc7c2
2015-08-12 17:02:33 -04:00
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
8adf6ba8f5
Add merged label on branches page
2015-08-11 23:00:46 +02:00
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
9bc512314a
Revert "Create and edit files in web editor via rugged"
...
This reverts commit 734a4ba87d
2015-08-11 11:52:33 +02:00
1891cab44c
Fix conflict issue
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 11:12:35 +02:00
3b02ad8467
Revert "Merge branches inside one repository using rugged instead of satellites"
...
This reverts commit d24c40ec21
2015-08-11 10:50:39 +02:00
32046983ad
Revert "Merge branch 'refactor-can-be-merge' into 'master'"
...
This reverts commit 459e6d3467804168e1de
2015-08-11 10:48:02 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
84727fba96
Revert "Merge branch 'improve-merge-requests' into 'master'
"
...
This reverts commit 4773f38e280d5d80b735
2015-08-11 10:26:19 +02:00
4773f38e28
Merge branch 'improve-merge-requests' into 'master'
...
Improve merge requests
- [x] Fetch merge request refs by IID
- [x] Ability to fetch any merge request
- [x] Link commits and diffs in merge request to target project
- [x] Improve merge request UI and command line instructions
- [x] Check merge request widget loading test coverage double
See merge request !1115
2015-08-07 14:44:54 +00:00
0d5d80b735
Merge branch 'comment-updated-by' into 'master'
...
Show who last edited a comment if it wasn't the original author
Fixes #1796 .
The `updated_by` user is also tracked for issues and merge requests, but it isn't currently shown, because "edited by Person" would give the idea that Person edited the description, while most updates to those are assignee/milestone/labels, in which case who made that change is already visible in the comments.
See merge request !1075
2015-08-07 14:44:28 +00:00
ad55f0d6f9
Merge branch 'master' into comment-updated-by
2015-08-07 15:05:17 +02:00
86bccb71a1
Create ref for every merge request. Add documentation for fetch merge requests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 12:54:58 +02:00
8dce66234f
Fetch to mr code from fork to iid
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 12:35:04 +02:00
fb6dc1f07d
Add `Group#add_*` convenience methods
...
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
2015-08-07 00:20:02 -04:00
2c46cf084b
Merge branch 'fix-namespace-move-dir' into 'master'
...
Ensure old namespace directory exists before moving it
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fixes #983
See merge request !1101
2015-08-06 16:09:11 +00:00
dcb0bf0df5
Merge branch 'report-spam'
2015-08-06 18:07:36 +02:00
cba7f20dc8
Allow users to send abuse reports
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 14:03:27 +02:00
8b6ae0104d
Merge branch 'master' into comment-updated-by
2015-08-06 12:52:26 +02:00
d044c14290
Ensure old namespace directory exists before moving it
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 12:31:24 +02:00
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
957e849f41
Merge branch 'drop-satellites'
2015-08-05 15:40:14 +02:00
caf4c0dd87
Merge branch 'ci-skipped-status' into 'master'
...
Added support for CI skipped status
This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216
See merge request !1073
2015-08-05 10:09:07 +00:00
6353ca9ae8
Revert "Update noteable after a new note is added"
...
This reverts commit fbdaf0e2a5
2015-08-05 12:00:12 +03:00
427b5df260
Added support for CI skipped status
2015-08-04 16:47:19 +02:00
b48b07044b
Merge branch 'master' into drop-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:42:36 +02:00
4ccd767abf
Only publish ssh key-type and key
2015-08-04 14:33:18 +02:00
f33898ecfb
Re-annotate models
2015-08-03 01:52:54 +09:00
3307008499
Merge branch 'admin-group-member' into 'master'
...
Add specific ability for managing group members
To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue)
See merge request !1059
2015-07-31 13:25:53 +00:00
04f2da3c37
Merge branch 'master' into comment-updated-by
2015-07-31 14:29:23 +02:00
a876db48d9
Merge branch 'api-new-attributes' into 'master'
...
Add project star and fork count, group avatar URL and user/group web URL attributes to API
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521 .
See merge request !1058
2015-07-30 21:38:48 +00:00
36bd6c8494
Show who last edited a comment if it wasn't the original author
2015-07-30 14:45:54 +02:00
2a60b8006b
Fix Project
2015-07-30 12:35:09 +02:00
b8066e2cd0
No more web url
2015-07-30 11:56:15 +02:00
3e9b612306
Check that project was actually created rather than just validated in import:repos task
...
Add gitlab-shell to error message to give user a clue that something may be wrong there.
Ran into this in #2082 . User was told that repositories were created when they were
not due to hooks symlink being wrong.
2015-07-29 10:49:13 -07:00
72c552c2d4
Fix specs
2015-07-29 13:23:28 +02:00
05cca9342b
Use URL helpers
2015-07-29 12:03:53 +02:00
Artem Sidorenko
Dmitriy Zaporozhets
Boyan Tabakov
Stan Hu
Ben Boeckel
Florent (HP)
Douwe Maan
Robert Speicher
Kamil Trzciński
Valery Sizov
Zeger-Jan van de Weg
Atsushi Ishida
Robert Speicher
