Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow primary email to be set to an email that you've already added.change-primary-email | Douwe Maan | 2015-04-30 | 6 | -18/+46 |
* | Merge branch 'search-layout' into 'master' | Dmitriy Zaporozhets | 2015-04-29 | 16 | -133/+161 |
|\ | |||||
| * | Fix tests | Dmitriy Zaporozhets | 2015-04-29 | 1 | -1/+1 |
| * | Move search categories (projects, issues etc) below search field. Instead use... | Dmitriy Zaporozhets | 2015-04-29 | 8 | -81/+87 |
| * | Continue refactoring and restyle of search layout | Dmitriy Zaporozhets | 2015-04-28 | 10 | -70/+98 |
| * | Draft improvements to search layout | Dmitriy Zaporozhets | 2015-04-28 | 11 | -115/+109 |
* | | Fix visibility settings UI in admin area | Dmitriy Zaporozhets | 2015-04-29 | 1 | -2/+2 |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-29 | 5 | -148/+80 |
|\ \ | |||||
| * \ | Merge branch 'footnotes-markdown' into 'master' | Douwe Maan | 2015-04-29 | 2 | -1/+3 |
| |\ \ | |||||
| | * | | Add footnotes support to Markdown | Guillaume Delbergue | 2015-04-24 | 2 | -1/+3 |
| * | | | Merge branch 'refactor-service-settings' into 'master' | Douwe Maan | 2015-04-29 | 3 | -147/+77 |
| |\ \ \ | |||||
| | * | | | Move service template and project service settings into a shared view | Stan Hu | 2015-04-29 | 3 | -147/+77 |
| |/ / / | |||||
* | | | | Merge branch 'Add_phrase_close_multiple_issues' into 'master' | Sytse Sijbrandij | 2015-04-29 | 1 | -1/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Added phrase "Here's how to close multiple issues in one commit message" so t... | Karen Carias | 2015-04-28 | 1 | -1/+3 |
* | | | | Merge branch 'fix_data' into 'master' | Dmitriy Zaporozhets | 2015-04-29 | 2 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | Remove abandoned GroupMembers | Valery Sizov | 2015-04-29 | 2 | -1/+7 |
|/ / / / | |||||
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-04-29 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #9220 from kylekatarnls/patch-1 | Jeroen van Baarsen | 2015-04-29 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fix #9219 Affix menu size change | Kyle | 2015-04-29 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #8677 from jubianchi/api-500-json | Jeroen van Baarsen | 2015-04-28 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Send 500 errors as JSON in the API | jubianchi | 2015-04-27 | 1 | -1/+1 |
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2015-04-29 | 3 | -1/+19 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'fix-commit-data-url-generation' into 'master' | Douwe Maan | 2015-04-28 | 3 | -1/+19 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Fix bug where commit data would not appear in some subdirectories | Stan Hu | 2015-04-26 | 3 | -2/+18 |
* | | | | | Revert "Fix '.container or .container-fluid should be the first child inside ... | Dmitriy Zaporozhets | 2015-04-29 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge branch 'rs-issue-2269' into 'master' | Dmitriy Zaporozhets | 2015-04-28 | 6 | -52/+10 |
|\ \ \ \ | |||||
| * | | | | Specs don't need to set default_url_options anymore | Robert Speicher | 2015-04-27 | 2 | -18/+0 |
| * | | | | Set default_url_options in test environments too | Robert Speicher | 2015-04-25 | 1 | -11/+9 |
| * | | | | Remove duplicate settings for default_url_options | Robert Speicher | 2015-04-25 | 3 | -23/+1 |
| |/ / / | |||||
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-04-28 | 8 | -12/+27 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #8680 from jubianchi/dev-rerun-foreman | Jeroen van Baarsen | 2015-04-28 | 3 | -5/+14 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Add a rake task to automatically restart foreman when changes occur | jubianchi | 2015-04-27 | 3 | -5/+14 |
| |/ / / | |||||
| * | | | Merge pull request #8754 from jirutka/fix-project_name_regex | Jeroen van Baarsen | 2015-04-27 | 3 | -4/+8 |
| |\ \ \ | |||||
| | * | | | Fix (project_)name_regex to accept non-ASCII letters and dash | Jakub Jirutka | 2015-04-27 | 3 | -4/+8 |
| * | | | | Merge pull request #8645 from chulkilee/hipchat-api-version | Dmitriy Zaporozhets | 2015-04-27 | 2 | -3/+5 |
| |\ \ \ \ | |||||
| | * | | | | Add api version property on hipchat service | Chulki Lee | 2015-04-27 | 2 | -3/+5 |
| | |/ / / | |||||
* | | | | | Merge branch 'admin-add-group-members' into 'master' | Dmitriy Zaporozhets | 2015-04-28 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix adding new group members from admin area | Dmitriy Zaporozhets | 2015-04-27 | 2 | -2/+2 |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Sytse Sijbrandij | 2015-04-27 | 4 | -6/+14 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'fix-relative-submodule-links-with-personal-projects' into 'master' | Dmitriy Zaporozhets | 2015-04-27 | 3 | -5/+13 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix broken file browsing with relative submodule in personal projects | Stan Hu | 2015-04-23 | 3 | -6/+13 |
| * | | | | | | | Merge branch 'upgrade-dockerfile-7.10.0' into 'master' | Robert Schilling | 2015-04-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | Upgrade Docker build to v7.10.0 | Stan Hu | 2015-04-27 | 1 | -1/+1 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge branch 'docker-improvements' into 'master' | Sytse Sijbrandij | 2015-04-28 | 1 | -9/+35 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add more instuctions on how to publish docker images yourself. | Sytse Sijbrandij | 2015-04-27 | 1 | -9/+35 |
|/ / / / / / | |||||
* | | | | | | Revert "Added X-GitLab-Event header for web hooks" | Valery Sizov | 2015-04-27 | 10 | -32/+21 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #9209 from Soullivaneuh/bootstrap-update | Jeroen van Baarsen | 2015-04-27 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Bootstrap 3.3.4 | Sullivan SENECHAL | 2015-04-27 | 1 | -3/+3 |
* | | | | | | Merge pull request #9208 from Soullivaneuh/container-class | Jeroen van Baarsen | 2015-04-27 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix '.container or .container-fluid should be the first child inside of a .na... | Sullivan SENECHAL | 2015-04-26 | 1 | -2/+2 |
| |/ / / / / |