Douwe Maan
45ab4d10ef
Validate historical active user count when uploading license.
2015-05-07 22:38:22 +02:00
Douwe Maan
2bb2ade50d
Merge branch 'master' into license
...
# Conflicts:
# db/schema.rb
2015-05-05 13:03:33 +02:00
Douwe Maan
5a14f5a49e
Tweak flash messages around license upload/removal.
2015-05-05 12:19:47 +02:00
Douwe Maan
6ff860d1fe
Show nice error when no license was selected.
2015-05-05 10:54:07 +02:00
Douwe Maan
68ac20604b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee
...
# Conflicts:
# app/controllers/groups/application_controller.rb
# app/services/test_hook_service.rb
# app/views/admin/groups/show.html.haml
# app/views/groups/_settings_nav.html.haml
# app/views/groups/show.html.haml
# app/views/layouts/_head.html.haml
# app/views/projects/_settings_nav.html.haml
# db/schema.rb
# features/project/project.feature
# features/steps/project/project.rb
2015-05-05 10:18:27 +02:00
Douwe Maan
e9e79fdfdf
Merge branch 'fix-escaped-branches-in-compare' into 'master'
...
Unescape branch names in compare commit
The upgrade in GitLab v7.9 to Rails v4.1.9 caused all branch names in the compare commit mode to be escaped (e.g. `/` to `%2F`). The compare mode would not always work when comparing against branch names with a forward slash.
Opted to unescape the branch name rather than use a wildcard segment to prevent escaping slashes because it seems like a more sensible URL. The slashes in this case aren't really represented by a tree structure (e.g. /compare/one/two/branch..another/branch/here).
* Closes #1399
* Closes https://github.com/gitlabhq/gitlabhq/issues/9105
See merge request !582
2015-05-04 06:58:56 +00:00
Douwe Maan
257f8057a2
Minor tweaks.
2015-05-03 15:41:40 +02:00
Dmitriy Zaporozhets
e097812f57
Merge pull request #9234 from dsander/group-milestones-by-title
...
Group milestones by title in the dashboard and all other issue views
2015-05-03 14:29:31 +03:00
Dmitriy Zaporozhets
4291e28af7
Merge branch 'change-primary-email' into 'master'
...
Allow primary email to be set to an email that you've already added.
Fixes gitlab-com/support-forum#106.
When the user sets their primary email to an email that they've already added to their account, this patch makes sure that secondary email record is destroyed, and a new email record is created for the old primary email. This is based on the assumption that in this case no email was meant to be deleted, but the user simply wanted to change which of their emails is primary.
See merge request !591
2015-05-03 11:00:51 +00:00
Stan Hu
eb4f1eb5f5
Add application setting to restrict user signups to e-mail domains
...
This feature was requested long ago:
http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains
This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong.
Only restrict e-mail addresses upon creation
2015-05-02 09:36:52 -07:00
Douwe Maan
d1f2b09fad
Allow license to be uploaded and enforce its validity.
2015-05-01 14:52:30 +02:00
Douwe Maan
a2eee3181c
Fix title on user page.
2015-05-01 11:33:54 +02:00
Douwe Maan
92fd3ccee0
Add helpers for header title and sidebar, and move setting those from controllers to layouts.
2015-05-01 10:39:16 +02:00
Dominik Sander
8d17e79d1d
Removed unused ApplicationController#set_filter_values method
...
The instance variables assigned in `set_filter_values` are not used by
anything anymore.
2015-05-01 00:18:40 +02:00
Stan Hu
ee92dd1683
Unescape branch names in compare commit
...
Closes #1399
Closes https://github.com/gitlabhq/gitlabhq/issues/9105
2015-04-30 12:44:46 -07:00
Douwe Maan
8c4b6d426d
Set head panel title of help section.
2015-04-30 21:28:07 +02:00
Douwe Maan
280a212443
Fix Profiles::PasswordsController.
2015-04-30 20:37:25 +02:00
Douwe Maan
5121576e0c
before_action > before_filter.
2015-04-30 20:02:21 +02:00
Douwe Maan
a3bd323cd3
Remove an old determine_layout call.
2015-04-30 20:02:00 +02:00
Douwe Maan
26ad250989
Add a page title to every page.
2015-04-30 19:12:15 +02:00
Douwe Maan
f2cf6d75ec
Merge branch 'show-invalid-projects-google-code-import' into 'master'
...
Show incompatible projects in Google Code import status
Using Google Code import with a JSON file that contained only one Subversion project led to confusion
over whether the system was working. Display the list of valid projects if there are any, and show a list of incompatible projects. Provide tips on how to retain issue data after conversion.
Closes #1531
## Screenshots
Before:
After with no projects available (notice the button is hidden):
After with 1 valid and 1 incompatible project:
See merge request !586
2015-04-30 17:08:45 +00:00
Douwe Maan
d386bb7808
Allow primary email to be set to an email that you've already added.
2015-04-30 16:17:03 +02:00
Stan Hu
9c76a6fa96
Show incompatible projects in Google Code import status
...
Importing a JSON file with only one Subversion project lead to confusion
over whether the system was working. Provide status why these projects
could not be imported directly.
Closes #1531
2015-04-30 06:56:49 -07:00
Douwe Maan
7e0eb486ed
Don't allow a merge request to be merged when its title starts with "WIP".
2015-04-30 15:46:36 +02:00
Dmitriy Zaporozhets
d5fe1e57d5
Draft improvements to search layout
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-04-28 12:48:42 +03:00
Dmitriy Zaporozhets
8140c68289
Merge branch 'rs-issue-2269' into 'master'
...
Remove duplicate settings for default_url_options
Closes #2269
See merge request !1797
2015-04-28 08:34:34 +00:00
Dmitriy Zaporozhets
c1a5f4710a
Merge pull request #8645 from chulkilee/hipchat-api-version
...
Add api version property on hipchat service
2015-04-27 17:07:54 +03:00
Valery Sizov
bc9ba5237c
Revert "Added X-GitLab-Event header for web hooks"
...
This reverts commit 548f182814
2015-04-27 16:29:31 +03:00
Chulki Lee
57c724558d
Add api version property on hipchat service
2015-04-27 21:14:04 +09:00
Dmitriy Zaporozhets
2e243fc321
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
README.md
VERSION
app/controllers/projects/services_controller.rb
app/controllers/projects/uploads_controller.rb
app/services/test_hook_service.rb
db/schema.rb
features/steps/admin/settings.rb
lib/gitlab/reference_extractor.rb
spec/models/note_spec.rb
2015-04-27 11:53:31 +03:00
Dmitriy Zaporozhets
278c3ba401
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-04-27 11:38:36 +03:00
Dmitriy Zaporozhets
2cbdfbfd1e
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-04-27 11:38:29 +03:00
Dmitriy Zaporozhets
38e2ae5ae0
Merge pull request #8644 from Bugagazavr/hook-events
...
Add X-GitLab-Event header for web hooks
2015-04-27 11:22:33 +03:00
Dominik Sander
3c3b43b0a0
Add notify and color options to HipchatService
...
When notify is set to true send messages will trigger a notification for
all room members.
Color changes the background color of the message.
2015-04-26 22:00:51 +02:00
Vinnie Okada
bd557e4b64
Add new admin settings
...
Add new global application settings for default project and snippet
visibility levels.
2015-04-26 07:48:19 -06:00
Robert Speicher
aa9435cddb
Remove duplicate settings for default_url_options
...
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
2015-04-25 19:46:04 -04:00
bugagazavr
548f182814
Added X-GitLab-Event header for web hooks
2015-04-25 21:31:52 +03:00
Douwe Maan
c2f11f3209
Get Gitorious importer to work again.
2015-04-24 23:30:12 +02:00
Douwe Maan
439b9f50af
Merge branch 'fix-slack-channel-in-admin-settings' into 'master'
...
Fix bug where Slack service channel was not saved in admin template settings
Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.
Closes https://github.com/gitlabhq/gitlabhq/issues/9181
Closes #1501
See merge request !574
2015-04-24 16:32:09 +00:00
Robert Speicher
ea9089647c
Merge branch 'rs-simplify-uploads-controller' into 'master'
...
Simplify the `skip_before_action` logic for UploadsController
See merge request !547
2015-04-24 16:26:32 +00:00
Stan Hu
2f04599751
Fix bug where Slack service channel was not saved in admin template settings.
...
Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.
Closes https://github.com/gitlabhq/gitlabhq/issues/9181
2015-04-24 08:33:24 -07:00
Douwe Maan
27af24c1c9
No longer needed to pass project argument to commit methods.
2015-04-24 12:29:36 +02:00
Douwe Maan
8ed7ac9d44
Use project.commit convenience method.
2015-04-24 12:29:36 +02:00
Dmitriy Zaporozhets
9148819323
Rename before_filter to before_action
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-04-24 12:53:33 +03:00
Dmitriy Zaporozhets
f502b293e5
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
db/schema.rb
spec/helpers/gitlab_markdown_helper_spec.rb
2015-04-24 11:22:54 +03:00
Robert Speicher
10053b173d
Simplify the skip_before_filter logic for UploadsController
2015-04-23 13:15:47 -04:00
Douwe Maan
a6dfd065ca
Add atom feed for project activity.
2015-04-23 17:11:39 +02:00
Dmitriy Zaporozhets
d4fb062d97
Merge branch 'sign-out-to-sign-in' into 'master'
...
Redirect to sign in page after signing out.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2125 .
See merge request !541
2015-04-23 12:38:11 +00:00
Dmitriy Zaporozhets
71f6143552
Merge branch 'master' into new-sidebar
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/controllers/snippets_controller.rb
2015-04-23 12:08:03 +03:00
Dmitriy Zaporozhets
4a63573b21
Start applying new layout to snippets pages
2015-04-22 18:17:43 +03:00
Douwe Maan
Dmitriy Zaporozhets
Stan Hu
Dominik Sander
Dmitriy Zaporozhets
Valery Sizov
Chulki Lee
Vinnie Okada
Robert Speicher
bugagazavr
Robert Speicher
