4e321ec11c
Merge branch 'improve-group-members-api' into 'master'
...
Improve group members api
Related #1720
See merge request !1225
2014-10-29 13:42:56 +00:00
a565c51b86
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2014-10-29 13:41:29 +02:00
93bed4435e
Merge pull request #8060 from dblessing/feature/bamboo_service
...
Add Atlassian Bamboo service
2014-10-29 13:41:13 +02:00
eea6a8a17d
Dont allow guests..developers to manage group members
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-29 13:38:00 +02:00
f6491508fe
Split group members api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-29 13:31:23 +02:00
527bbd44de
Merge branch 'master' into 'master'
...
Close #717
This closes #717 :
Add documentation changes to:
* Set the permissions of the unix socket properly
* Create the directory for the socket
* Make sure tmpfiles.d persists said directory
The first change makes sure gitlabl can connect to the socket. The latter two avoid redis from failing to start on systemd-based systems, including recent versions of Debian.
You may probably want to cherry-pick this into the documentation for the latest stable release.
See merge request !224
2014-10-29 11:01:18 +00:00
7c00a841f5
Merge pull request #8187 from bbodenmiller/patch-4
...
minor requirements.md cleanup
2014-10-28 23:04:40 +01:00
d6db6dda75
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2014-10-28 20:02:40 +02:00
fa39863611
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-28 20:02:01 +02:00
dc4caa26bf
minor requirements.md cleanup
...
* "Non Unix"->"Non-Unix"
* Fix poor wording
2014-10-28 09:47:57 -07:00
1ad78be981
Merge branch 'transfer-service-spec-cleanups' into 'master'
...
Transfer service spec cleanups
Simplify the current tests for Projects::TransferService
See merge request !208
2014-10-28 14:19:27 +00:00
c71792d98c
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2014-10-28 16:15:31 +02:00
d0ebdedf98
Merge branch 'mr-vinn/gitlab-ce-api-project-delete'
2014-10-28 16:14:46 +02:00
576a80e97c
Merge branch 'api-project-delete' of https://gitlab.com/mr-vinn/gitlab-ce into mr-vinn/gitlab-ce-api-project-delete
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
spec/features/projects_spec.rb
2014-10-28 16:14:40 +02:00
f3c120d25a
Add failing test that should be green after group members api get fixed
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-28 16:00:03 +02:00
9306d8fca2
Merge branch 'dashboard_issues_and_mr' into 'master'
...
Dashboard issues and merge request filters
Fixes #1597
See merge request !1219
2014-10-28 13:38:41 +00:00
eaebc20eba
Merge branch 'disable_email_option' into 'master'
...
Disable email option
Fixes #1569
See merge request !1222
2014-10-28 13:36:28 +00:00
2a16bbd626
Merge pull request #7572 from mr-vinn/application-js-fix
...
Handle undefined text area values
2014-10-28 15:23:45 +02:00
ec4a079099
Merge pull request #7976 from bbodenmiller/patch-9
...
support latest firefox esr release
2014-10-28 14:07:42 +02:00
776bca07cd
Add Atlassian Bamboo service
2014-10-28 05:20:36 -05:00
b23b78ada1
Merge pull request #7866 from cirosantilli/input-button-to-tag
...
Use button type=submit instead of input.
2014-10-28 12:11:15 +02:00
beabf5db8c
Merge pull request #8091 from cirosantilli/factor-ability-abilities
...
Factor abilities methods
2014-10-28 12:09:55 +02:00
26175e4459
Merge pull request #8127 from cirosantilli/user-select-js-only-needed
...
Run user select Js only where needed
2014-10-28 12:08:57 +02:00
45d9446978
Merge pull request #8178 from dblessing/backport/update-doc
...
Change update recommendation
2014-10-27 11:27:05 -07:00
01441f544e
Merge pull request #8120 from cirosantilli/profile-js-only-needed
...
Only run profile js on pages that need it
2014-10-27 20:01:47 +02:00
2d187976be
Run user select Js only where needed
...
Transform current implementation into regular Coffescript classes
so that the same call method can be reused on the dispatcher
as for other classes.
2014-10-27 18:28:36 +01:00
367d4db4cd
Merge pull request #8155 from cirosantilli/unassigned
...
Show nothing instead of unassigned on issues
2014-10-27 19:21:26 +02:00
32a7d49a36
Merge pull request #8125 from cirosantilli/namespace-select-js-only-needed
...
Only run namespace select js when needed
2014-10-27 19:19:35 +02:00
f4178f9601
Merge pull request #8005 from cirosantilli/settings-to-gitlab-config
...
Use Gitlab.config instead of Settings everywhere
2014-10-27 19:18:48 +02:00
243a74e995
Merge pull request #8123 from cirosantilli/project-js-only-needed
...
Better js -> URL projects map to reduce unneeded execution
2014-10-27 19:18:27 +02:00
08d361e8b3
Merge branch 'improve_release_doc' into 'master'
...
Improvements for release documentation
See merge request !1203
2014-10-27 16:56:22 +00:00
28c08775b3
Add a comment in interceptor spec.
2014-10-27 15:11:03 +01:00
3b6737f970
Add interceptor test.
2014-10-27 15:08:37 +01:00
fd44d0b6c2
update release doc
2014-10-27 16:02:21 +02:00
94d8698a85
Merge branch 'fix_raw_view_snippets' into 'master'
...
Fix raw view snippets
See merge request !1220
2014-10-27 13:56:57 +00:00
8101640c33
Change update recommendation
2014-10-27 08:30:57 -05:00
d78e80fa74
Add email interceptor to prevent mail sending if email sending is disabled.
2014-10-27 13:05:50 +01:00
d504ca8a0c
Add settings to disable email sending from GitLab.
2014-10-27 13:02:12 +01:00
f9885c0c3c
Merge branch '7-4-stable-non-conflict' into 'master'
...
7-4-stable to master. With resolved conflicts
See merge request !1221
2014-10-27 11:48:24 +00:00
21e8f43af3
Merge branch 'master' into 7-4-stable
...
Conflicts:
CHANGELOG
VERSION
2014-10-27 12:08:44 +02:00
2f6856f713
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-10-27 12:00:19 +02:00
40c8f159a2
Fix raw view for public snippets
2014-10-27 11:51:31 +02:00
d3bdd3ba67
Do not filter out issues and merge requests related to user right away.
2014-10-27 10:02:20 +01:00
5e017a4566
Assigned merge request should show on dashboard mr overiew feature spec.
2014-10-27 09:53:35 +01:00
93532432dc
Failing feature for dashboard merge requests when user has authored issues on forked project source.
2014-10-27 09:30:39 +01:00
d747612385
Failing feature for dashboard issues when user has authored issues on projects he is not a member of.
2014-10-27 09:20:43 +01:00
199029b842
Merge pull request #8158 from cirosantilli/basename-dirname-split
...
Merge File basename and direname into split
2014-10-25 10:35:07 +02:00
6280b53f30
Merge branch 'update_patch_doc' into 'master'
...
Update patch release document
See merge request !1218
2014-10-24 20:32:07 +00:00
250d582bdd
update patch document
2014-10-24 22:28:02 +03:00
f6bed511cd
Merge pull request #8126 from bbodenmiller/cleanup-release
...
cleanup monthly release details
2014-10-24 20:41:44 +02:00
Valery Sizov
Dmitriy Zaporozhets
Jacob Vosmaer
Robert Schilling
Ben Bodenmiller
Dmitriy Zaporozhets
Drew Blessing
Sytse Sijbrandij
Ciro Santilli
Marin Jankovski