summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow primary email to be set to an email that you've already added.change-primary-emailDouwe Maan2015-04-306-18/+46
* Merge branch 'search-layout' into 'master'Dmitriy Zaporozhets2015-04-2916-133/+161
|\
| * Fix testsDmitriy Zaporozhets2015-04-291-1/+1
| * Move search categories (projects, issues etc) below search field. Instead use...Dmitriy Zaporozhets2015-04-298-81/+87
| * Continue refactoring and restyle of search layoutDmitriy Zaporozhets2015-04-2810-70/+98
| * Draft improvements to search layoutDmitriy Zaporozhets2015-04-2811-115/+109
* | Fix visibility settings UI in admin areaDmitriy Zaporozhets2015-04-291-2/+2
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-295-148/+80
|\ \
| * \ Merge branch 'footnotes-markdown' into 'master'Douwe Maan2015-04-292-1/+3
| |\ \
| | * | Add footnotes support to MarkdownGuillaume Delbergue2015-04-242-1/+3
| * | | Merge branch 'refactor-service-settings' into 'master'Douwe Maan2015-04-293-147/+77
| |\ \ \
| | * | | Move service template and project service settings into a shared viewStan Hu2015-04-293-147/+77
| |/ / /
* | | | Merge branch 'Add_phrase_close_multiple_issues' into 'master'Sytse Sijbrandij2015-04-291-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Added phrase "Here's how to close multiple issues in one commit message" so t...Karen Carias2015-04-281-1/+3
* | | | Merge branch 'fix_data' into 'master'Dmitriy Zaporozhets2015-04-292-1/+7
|\ \ \ \
| * | | | Remove abandoned GroupMembersValery Sizov2015-04-292-1/+7
|/ / / /
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-292-2/+2
|\ \ \ \
| * \ \ \ Merge pull request #9220 from kylekatarnls/patch-1Jeroen van Baarsen2015-04-291-1/+1
| |\ \ \ \
| | * | | | Fix #9219 Affix menu size changeKyle2015-04-291-1/+1
| |/ / / /
| * | | | Merge pull request #8677 from jubianchi/api-500-jsonJeroen van Baarsen2015-04-281-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Send 500 errors as JSON in the APIjubianchi2015-04-271-1/+1
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-04-293-1/+19
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'fix-commit-data-url-generation' into 'master'Douwe Maan2015-04-283-1/+19
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix bug where commit data would not appear in some subdirectoriesStan Hu2015-04-263-2/+18
* | | | | Revert "Fix '.container or .container-fluid should be the first child inside ...Dmitriy Zaporozhets2015-04-291-2/+2
|/ / / /
* | | | Merge branch 'rs-issue-2269' into 'master'Dmitriy Zaporozhets2015-04-286-52/+10
|\ \ \ \
| * | | | Specs don't need to set default_url_options anymoreRobert Speicher2015-04-272-18/+0
| * | | | Set default_url_options in test environments tooRobert Speicher2015-04-251-11/+9
| * | | | Remove duplicate settings for default_url_optionsRobert Speicher2015-04-253-23/+1
| |/ / /
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-288-12/+27
|\ \ \ \
| * \ \ \ Merge pull request #8680 from jubianchi/dev-rerun-foremanJeroen van Baarsen2015-04-283-5/+14
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add a rake task to automatically restart foreman when changes occurjubianchi2015-04-273-5/+14
| |/ / /
| * | | Merge pull request #8754 from jirutka/fix-project_name_regexJeroen van Baarsen2015-04-273-4/+8
| |\ \ \
| | * | | Fix (project_)name_regex to accept non-ASCII letters and dashJakub Jirutka2015-04-273-4/+8
| * | | | Merge pull request #8645 from chulkilee/hipchat-api-versionDmitriy Zaporozhets2015-04-272-3/+5
| |\ \ \ \
| | * | | | Add api version property on hipchat serviceChulki Lee2015-04-272-3/+5
| | |/ / /
* | | | | Merge branch 'admin-add-group-members' into 'master'Dmitriy Zaporozhets2015-04-282-2/+2
|\ \ \ \ \
| * | | | | Fix adding new group members from admin areaDmitriy Zaporozhets2015-04-272-2/+2
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-04-274-6/+14
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-relative-submodule-links-with-personal-projects' into 'master'Dmitriy Zaporozhets2015-04-273-5/+13
| |\ \ \ \ \ \
| | * | | | | | Fix broken file browsing with relative submodule in personal projectsStan Hu2015-04-233-6/+13
| * | | | | | | Merge branch 'upgrade-dockerfile-7.10.0' into 'master'Robert Schilling2015-04-271-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Upgrade Docker build to v7.10.0Stan Hu2015-04-271-1/+1
| | | |/ / / / | | |/| | | |
* | | | | | | Merge branch 'docker-improvements' into 'master'Sytse Sijbrandij2015-04-281-9/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add more instuctions on how to publish docker images yourself.Sytse Sijbrandij2015-04-271-9/+35
|/ / / / / /
* | | | | | Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-2710-32/+21
| |_|/ / / |/| | | |
* | | | | Merge pull request #9209 from Soullivaneuh/bootstrap-updateJeroen van Baarsen2015-04-271-3/+3
|\ \ \ \ \
| * | | | | Bootstrap 3.3.4Sullivan SENECHAL2015-04-271-3/+3
* | | | | | Merge pull request #9208 from Soullivaneuh/container-classJeroen van Baarsen2015-04-271-2/+2
|\ \ \ \ \ \
| * | | | | | Fix '.container or .container-fluid should be the first child inside of a .na...Sullivan SENECHAL2015-04-261-2/+2
| |/ / / / /