85145d1d77
Disable changing of the source branch in merge request update API
2015-05-29 09:40:35 -07:00
467d7f6720
Improve UI of project sidebar
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29 18:12:31 +02:00
a3b60982e5
Merge branch 'leave-project' into 'master'
...
Add ability to leave project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !744
2015-05-29 15:10:46 +00:00
a1c45338f3
Merge branch 'support-edit-target-branch-in-mr' into 'master'
...
Support editing target branch of merge request
### What does this MR do?
This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens.
### Why was this MR needed?
Because lots of people requested this feature. :)
### Screenshots
**Edit MR page**
**New MR page**
**System note**
### What are the relevant issue numbers?
* Closes https://github.com/gitlabhq/gitlabhq/issues/7105
* See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130 !
See merge request !738
2015-05-29 15:01:54 +00:00
ab2e67550b
Merge branch 'user-oauth-applications' into 'master'
...
Add option to disallow users from registering any application to use GitLab as an OAuth provider
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2264 .
See merge request !742
2015-05-29 14:51:33 +00:00
7815f9ddac
Make leave buttons more explicit
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29 16:34:26 +02:00
4f0f182244
Add changelog item about leave project feature
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29 16:26:08 +02:00
2afa5fcb52
Add ability to leave project
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29 16:23:36 +02:00
394fe7614c
Merge branch 'leave-group' into 'master'
...
User should be able to leave group. If not - show him proper message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !743
2015-05-29 13:35:05 +00:00
907bbb2b05
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-29 15:14:48 +02:00
d4a58c685f
Style header search field on focus
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29 15:14:29 +02:00
85de253ee1
Fix tests for group leave feature
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29 15:07:04 +02:00
cef746dc94
User should be able to leave group. If not - show him proper message
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29 14:12:30 +02:00
4a1df710f8
Merge branch 'mr-wip-text' into 'master'
...
Shorten merge request WIP text.
See merge request !741
2015-05-29 11:34:18 +00:00
96d6fdc27c
Add option to disallow users from registering any application to use GitLab as an OAuth provider
2015-05-29 13:29:16 +02:00
5e4384ec9b
Support editing target branch of merge request
...
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
2015-05-29 04:08:08 -07:00
70b29c3576
Merge branch 'feature/saml_support' into 'master'
...
Add SAML support via Omniauth
Split of !669 , with doc
See merge request !722
2015-05-29 10:37:27 +00:00
aa97325dea
Merge branch 'rs-merge-request-tabs-the-third' into 'master'
...
Include location.search and location.hash in URL for replaceState
Forgot these 😊
See merge request !740
2015-05-29 10:23:33 +00:00
d5b1c58e26
Shorten merge request WIP text.
2015-05-29 11:37:12 +02:00
7f529ef0f7
Include location.search and location.hash in URL for replaceState
2015-05-29 05:15:09 -04:00
2f3a11fed3
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-29 11:11:12 +02:00
acb7721fe8
Merge branch 'rs-teaspoon' into 'master'
...
Add Teaspoon for Javascript testing
Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect.
See https://github.com/modeset/teaspoon
See merge request !715
2015-05-29 09:10:46 +00:00
e11e042d89
Fix diff header with submodule change
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29 11:01:40 +02:00
ac584d6b08
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-29 10:57:35 +02:00
c090ebc07e
Merge branch 'rs-persist-tab-selection-more-betterer' into 'master'
...
Improve MergeRequest tab-persisting behavior
Now uses the path instead of the hash.
See discussion in !728
See merge request !737
2015-05-29 08:44:23 +00:00
d047d299bf
Merge pull request #9318 from jvanbaarsen/allow-special-chars-bio
...
Allow special characters in users bio
2015-05-29 10:41:01 +02:00
3f156ed482
Improve MergeRequest tab-persisting behavior
...
Now uses the path instead of the hash.
See discussion in #728 .
2015-05-29 00:27:56 -04:00
f46b367068
Add MergeRequests#commits action and route
...
/:namespace_id/:project_id/merge_requests/:id/commits(.:format)
2015-05-29 00:09:28 -04:00
cef8ab4604
Bump turbolinks version
2015-05-29 00:05:14 -04:00
f95eeee1d6
Merge branch 'master' into 'master'
...
Remove extra brace
Extraneous curly brace creeped in prior commit.
See merge request !734
2015-05-29 00:25:23 +00:00
bd12ca5eb3
Disable Rack::MiniProfiler for /teaspoon path
2015-05-28 18:22:33 -04:00
330c25385b
Update jasmine:ci task to use teaspoon
2015-05-28 18:22:33 -04:00
d2256c18f4
Stub ajax in JS specs
2015-05-28 18:22:32 -04:00
c9788bd9d8
Remove jasmine-fixture, use teaspoon fixtures
2015-05-28 18:22:32 -04:00
73440b0364
Javascripts don't need to require jquery or bootstrap explicitly
2015-05-28 18:22:32 -04:00
d850a57ff4
teaspoon install
2015-05-28 18:22:32 -04:00
05aa71ccd9
Remove jasmine-rails; add teaspoon
2015-05-28 18:22:32 -04:00
b8977cb432
Remove extra brace
2015-05-28 16:09:07 -04:00
51888f746c
Merge branch 'nicer-acccount-page' into 'master'
...
Make user settings account page nicer
* make 2 factor auth section `panel-default`
* make oauth buttons smaller
* remove primary button from reset token form
See merge request !733
2015-05-28 19:52:26 +00:00
08a12f24b0
Make user settings account page nicer
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 20:36:47 +02:00
d0d596ae4a
Merge branch 'project-aside' into 'master'
...
Use panels instead of well for widgets in project sidebar
Cleaner look and less distractive
See merge request !732
2015-05-28 16:11:55 +00:00
a01737ac78
Use panels instead of well for widgets in project sidebar
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 17:30:05 +02:00
ce5928f4df
Merge branch 'profile-settings'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/profiles/accounts/show.html.haml
2015-05-28 16:31:38 +02:00
ad3462332b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-28 16:10:28 +02:00
0c7da9d534
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-05-28 16:09:58 +02:00
9e50f28ee9
Fix profile tests after header rename
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 15:32:28 +02:00
35d0d774a1
Prefer panels over fieldset when different forms
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 15:26:37 +02:00
05a44dcb8b
Merge branch 'user-destroy-wo-groups' into 'master'
...
You can not remove user if he/she is an only owner of group
To prevent loose of group data you need to transfer or remove group
first before you can remove user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !730
2015-05-28 13:14:58 +00:00
47989d6037
Consistent header look for setting pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 14:54:05 +02:00
dcc9dc94d5
Re-organize profile settings titles and headers
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 14:44:38 +02:00
Stan Hu
Dmitriy Zaporozhets
Douwe Maan
Robert Speicher
Robert Speicher
Mike Butsko
