summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Make Reply-To config apply to change e-mail confirmation and other notificationsStan Hu2015-05-011-0/+4
* Merge branch 'show-invalid-projects-google-code-import' into 'master'Douwe Maan2015-04-302-9/+30
|\
| * Show incompatible projects in Google Code import statusStan Hu2015-04-302-9/+30
* | Merge branch 'fix-submodule-error-with-forked-project' into 'master'Dmitriy Zaporozhets2015-04-303-5/+5
|\ \
| * | Fix "Revspec not found" errors when viewing diffs in a forked project with su...Stan Hu2015-04-273-5/+5
* | | Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into So...Dmitriy Zaporozhets2015-04-3010-19/+22
|\ \ \
| * | | Fix wrong placement of show-aside linkSullivan SENECHAL2015-04-2710-19/+22
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-304-5/+37
|\ \ \ \
| * | | | Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-304-5/+37
| | |_|/ | |/| |
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-04-3018-278/+212
|\ \ \ \ | |/ / /
| * | | Merge branch 'search-layout' into 'master'Dmitriy Zaporozhets2015-04-2914-130/+134
| |\ \ \
| | * | | 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-289-68/+72
| | * | | Draft improvements to search layoutDmitriy Zaporozhets2015-04-2811-115/+109
| * | | | Fix visibility settings UI in admin areaDmitriy Zaporozhets2015-04-291-2/+2
| * | | | Merge branch 'footnotes-markdown' into 'master'Douwe Maan2015-04-291-1/+2
| |\ \ \ \
| | * | | | Add footnotes support to MarkdownGuillaume Delbergue2015-04-241-1/+2
| * | | | | Move service template and project service settings into a shared viewStan Hu2015-04-293-147/+77
* | | | | | Fix .container position on navbar (reloaded)Sullivan SENECHAL2015-04-296-80/+73
|/ / / / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-291-1/+1
|\ \ \ \ \
| * | | | | Fix #9219 Affix menu size changeKyle2015-04-291-1/+1
| | |/ / / | |/| | |
* | | | | 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-283-23/+1
|\ \ \ \
| * | | | Remove duplicate settings for default_url_optionsRobert Speicher2015-04-253-23/+1
| | |/ / | |/| |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-282-3/+5
|\ \ \ \
| * \ \ \ 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-281-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix adding new group members from admin areaDmitriy Zaporozhets2015-04-271-1/+1
* | | | | | Merge branch 'fix-relative-submodule-links-with-personal-projects' into 'master'Dmitriy Zaporozhets2015-04-271-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix broken file browsing with relative submodule in personal projectsStan Hu2015-04-231-1/+1
* | | | | | Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-277-21/+15
| |_|/ / / |/| | | |
* | | | | 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
| | |_|/ / | |/| | |
* | | | | Merge pull request #9207 from Soullivaneuh/x-ua-compatibleJeroen van Baarsen2015-04-271-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix "`<head>` is missing X-UA-Compatible `<meta>` tag that disables old IE co...Sullivan SENECHAL2015-04-261-0/+1
| |/ / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-2722-169/+248
|\ \ \ \
| * \ \ \ Merge branch 'fix-gitorious-importer' into 'master'Dmitriy Zaporozhets2015-04-271-1/+1
| |\ \ \ \
| | * | | | Get Gitorious importer to work again.fix-gitorious-importerDouwe Maan2015-04-241-1/+1
| | |/ / /
| * | | | Merge branch 'forked-event' into 'master'Dmitriy Zaporozhets2015-04-274-58/+36
| |\ \ \ \
| | * | | | Use Projects::CreateService to fork projects so that after-create hooks are run.forked-eventDouwe Maan2015-04-244-58/+36
| * | | | | Merge branch 'rs-minor-styles' into 'master'Dmitriy Zaporozhets2015-04-2716-110/+105
| |\ \ \ \ \
| | * | | | | Place the logo's tooltip dynamicallyrs-minor-stylesRobert Speicher2015-04-252-1/+9
| | * | | | | Add data-placement attributes for all sidebar linksRobert Speicher2015-04-259-70/+70
| | * | | | | Add collapsed navbar links to the default tooltip selectorRobert Speicher2015-04-252-5/+1
| | * | | | | There's no longer a reason to re-render the header on Design updatesRobert Speicher2015-04-251-3/+0
| | * | | | | Remove the `has_bottom_tooltip` classRobert Speicher2015-04-253-17/+13
| | * | | | | Fix Profile > Design live-updatingRobert Speicher2015-04-251-1/+1
| | * | | | | Items with tooltips don't need a 'data-original-title' attributeRobert Speicher2015-04-251-22/+21
| | * | | | | Don't override color of code blocks in notesRobert Speicher2015-04-251-1/+0