summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow user to specify content he wants to see on project pageproject-default-viewDmitriy Zaporozhets2015-07-1313-39/+82
* Merge branch 'no-icon-for-back' into 'master'Dmitriy Zaporozhets2015-07-136-6/+12
|\
| * Hide icon for bact-to-location menu in sidebarDmitriy Zaporozhets2015-07-136-6/+12
|/
* Merge branch 'ssh-key-linebreaks' into 'master'Dmitriy Zaporozhets2015-07-133-1/+9
|\
| * Add error message for SSH key linebreaksNikita Verkhovin2015-07-123-1/+9
* | Merge branch 'rs-issue-1908' into 'master'Dmitriy Zaporozhets2015-07-136-2/+17
|\ \
| * | Update msapplication-TileColor valuers-issue-1908Robert Speicher2015-07-101-1/+1
| * | Update background color for touch-icon-* imagesRobert Speicher2015-07-104-0/+0
| * | Add Windows 8 pinned site tile meta tagsRobert Speicher2015-07-092-0/+4
| * | Add Safari/iOS versions of the logoRobert Speicher2015-07-095-2/+13
* | | Merge branch 'vis_btn_color_change' into 'master'Dmitriy Zaporozhets2015-07-131-1/+1
|\ \ \
| * | | Changed to using the btn classvis_btn_color_changeDarby2015-07-103-15/+2
| * | | Changed the color of admin/application_settings buttonsDarby2015-06-242-1/+14
* | | | Merge branch 'rs-disable-2fa-by-admin' into 'master'Dmitriy Zaporozhets2015-07-136-0/+70
|\ \ \ \
| * | | | Add a button to Admin::Users#show to disable 2FA for that userrs-disable-2fa-by-adminRobert Speicher2015-07-103-0/+35
| * | | | Add disable_two_factor route for Admin::UsersRobert Speicher2015-07-103-0/+35
* | | | | Merge branch 'rs-disable-2fa' into 'master'Dmitriy Zaporozhets2015-07-135-17/+33
|\ \ \ \ \ | |/ / / /
| * | | | Add User#disable_two_factor!rs-disable-2faRobert Speicher2015-07-105-17/+33
* | | | | Merge branch 'fix-api-project-transfer' into 'master'Dmitriy Zaporozhets2015-07-136-20/+20
|\ \ \ \ \
| * | | | | Update specs.fix-api-project-transferDouwe Maan2015-07-111-5/+5
| * | | | | Fix transferring of project to another group using the API.Douwe Maan2015-07-115-15/+15
* | | | | | Merge branch 'hsts-check-port-443' into 'master'Marin Jankovski2015-07-132-1/+5
|\ \ \ \ \ \
| * | | | | | Only enable HSTS header for HTTPS and port 443Stan Hu2015-07-122-1/+5
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-129-30/+178
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'search-git-grep' into 'master'Dmitriy Zaporozhets2015-07-125-0/+61
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Mention search improvements in CHANGELOGDmitriy Zaporozhets2015-07-121-0/+1
| | * | | | | | Add tests for repository search filesDmitriy Zaporozhets2015-07-122-1/+25
| | * | | | | | Fix search blobs for wikiDmitriy Zaporozhets2015-07-123-2/+3
| | * | | | | | Implement search of code via git grepsearch-git-grepDmitriy Zaporozhets2015-07-102-0/+35
| * | | | | | | Merge branch 'improve-autocomplete-controller-for-unknowns' into 'master'Hannes Rosenögger2015-07-112-29/+86
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Better handle unknown projects and groups for autocompleteStan Hu2015-07-112-29/+86
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'fix-changelog-typos' into 'master'Stan Hu2015-07-111-2/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix typo and remove duplicate entry shipped in v7.12.2Stan Hu2015-07-111-2/+1
| |/ / / / /
| * | | | | Merge branch 'fix-autocomplete-with-public-projects' into 'master'Hannes Rosenögger2015-07-113-1/+30
| |\ \ \ \ \
| | * | | | | Fix user autocomplete for unauthenticated users accessing public projectsStan Hu2015-07-103-1/+30
| * | | | | | Merge branch 'fix-multiple-dropzone-icons' into 'master'Dmitriy Zaporozhets2015-07-101-3/+3
| |\ \ \ \ \ \
| | * | | | | | Do not add the same icon multiple times to dropzonesDaniel Gerhardt2015-07-101-3/+3
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'fig-info' into 'master'Sytse Sijbrandij2015-07-101-3/+5
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | information about why we use fig.ymlkaren Carias2015-07-101-3/+5
| |/ / / / /
* | | | | | Merge branch 'link-multiple-issues' into 'master' Sytse Sijbrandij2015-07-101-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | added link to issue closing pattern in dockaren Carias2015-07-101-0/+2
|/ / / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-07-102-2/+2
|\ \ \ \ \
| * | | | | Update image to latest oneSytse Sijbrandij2015-07-101-1/+1
| * | | | | Merge branch 'fix-migrating-from-svn-doc-link' into 'master'Stan Hu2015-07-101-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix migrating from SVN document linkStan Hu2015-07-101-1/+1
| | |/ / /
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSytse Sijbrandij2015-07-1023-17/+189
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'compact-sidebar' into 'master'Dmitriy Zaporozhets2015-07-101-6/+3
| |\ \ \ \
| | * | | | Smaller font and leing height for sidebar elementsDmitriy Zaporozhets2015-07-101-6/+3
| |/ / / /
| * | | | Merge branch 'labels-small-buttons' into 'master'Dmitriy Zaporozhets2015-07-101-2/+2
| |\ \ \ \
| | * | | | Make edit/remove label buttons smallerlabels-small-buttonsDmitriy Zaporozhets2015-07-101-2/+2
| |/ / / /