summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-escaped-branches-in-compare' into 'master'Douwe Maan2015-05-041-2/+4
|\
| * Unescape branch names in compare commitStan Hu2015-04-301-2/+4
* | Merge pull request #9234 from dsander/group-milestones-by-titleDmitriy Zaporozhets2015-05-031-25/+0
|\ \
| * | Removed unused ApplicationController#set_filter_values methodDominik Sander2015-05-011-25/+0
* | | Merge branch 'change-primary-email' into 'master'Dmitriy Zaporozhets2015-05-032-7/+7
|\ \ \
| * | | Allow primary email to be set to an email that you've already added.change-primary-emailDouwe Maan2015-04-302-7/+7
| | |/ | |/|
* | | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-021-1/+2
* | | Fix title on user page.you-get-a-title-and-you-get-a-title-and-everyone-gets-a-titleDouwe Maan2015-05-011-3/+0
* | | Add helpers for header title and sidebar, and move setting those from control...Douwe Maan2015-05-0115-98/+28
* | | Set head panel title of help section.Douwe Maan2015-04-301-0/+7
* | | Fix Profiles::PasswordsController.Douwe Maan2015-04-301-1/+1
* | | before_action > before_filter.Douwe Maan2015-04-301-1/+1
* | | Remove an old determine_layout call.Douwe Maan2015-04-301-2/+0
* | | Add a page title to every page.Douwe Maan2015-04-3034-108/+118
* | | Merge branch 'show-invalid-projects-google-code-import' into 'master'Douwe Maan2015-04-301-0/+1
|\ \ \ | |_|/ |/| |
| * | Show incompatible projects in Google Code import statusStan Hu2015-04-301-0/+1
| |/
* | Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-301-2/+2
|/
* Draft improvements to search layoutDmitriy Zaporozhets2015-04-281-3/+6
* Merge branch 'rs-issue-2269' into 'master'Dmitriy Zaporozhets2015-04-281-12/+0
|\
| * Remove duplicate settings for default_url_optionsRobert Speicher2015-04-251-12/+0
* | Merge pull request #8645 from chulkilee/hipchat-api-versionDmitriy Zaporozhets2015-04-271-1/+1
|\ \
| * | Add api version property on hipchat serviceChulki Lee2015-04-271-1/+1
* | | Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-271-1/+1
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-271-1/+1
|\ \
| * | Get Gitorious importer to work again.fix-gitorious-importerDouwe Maan2015-04-241-1/+1
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-272-2/+3
|\ \
| * \ Merge pull request #8644 from Bugagazavr/hook-eventsDmitriy Zaporozhets2015-04-271-1/+1
| |\ \
| | * | Added X-GitLab-Event header for web hooksbugagazavr2015-04-251-1/+1
| | |/
| * | Add notify and color options to HipchatServiceDominik Sander2015-04-261-1/+2
| |/
* | Add new admin settingsVinnie Okada2015-04-261-0/+2
|/
* Merge branch 'fix-slack-channel-in-admin-settings' into 'master'Douwe Maan2015-04-242-20/+10
|\
| * Fix bug where Slack service channel was not saved in admin template settings.Stan Hu2015-04-242-20/+10
* | Merge branch 'rs-simplify-uploads-controller' into 'master'Robert Speicher2015-04-241-5/+2
|\ \ | |/ |/|
| * Simplify the `skip_before_filter` logic for UploadsControllerrs-simplify-uploads-controllerRobert Speicher2015-04-231-5/+2
* | No longer needed to pass project argument to commit methods.Douwe Maan2015-04-241-3/+3
* | Use project.commit convenience method.Douwe Maan2015-04-242-2/+2
* | Add atom feed for project activity.Douwe Maan2015-04-231-5/+13
|/
* Merge branch 'sign-out-to-sign-in' into 'master'Dmitriy Zaporozhets2015-04-231-0/+4
|\
| * Redirect to sign in page after signing out.Douwe Maan2015-04-181-0/+4
* | Merge branch 'master' into new-sidebarDmitriy Zaporozhets2015-04-2364-195/+199
|\ \
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-211-1/+1
| |\ \
| | * | Fix redirect when trying to view invalid Google Code import status.Douwe Maan2015-04-211-1/+1
| * | | Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-2064-195/+195
| |/ /
* | | Start applying new layout to snippets pagesDmitriy Zaporozhets2015-04-221-22/+18
|/ /
* | Merge branch 'better-commit-mentions' into 'master'Dmitriy Zaporozhets2015-04-201-3/+3
|\ \
| * | Clean up code around commit mentions.Douwe Maan2015-04-151-3/+3
* | | Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'Dmitriy Zaporozhets2015-04-201-7/+28
|\ \ \
| * | | Explain skip_before_filter workaround.haynes/gitlab-ce-remove_access_control_for_imagesDouwe Maan2015-04-171-2/+5
| * | | Correctly handle blocked users.Douwe Maan2015-04-171-15/+14
| * | | remove access control for imagesHannes Rosenögger2015-04-161-6/+25
| |/ /
View Lorry Controller Status