summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 6.7.1v6.7.1Dmitriy Zaporozhets2014-03-212-1/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix gitlab-ci integrationDmitriy Zaporozhets2014-03-211-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'update-install-doc-branch' into '6-7-stable'Dmitriy Zaporozhets2014-03-211-1/+1
|\ | | | | | | | | | | Update Install Doc Branch /cc @marin
| * Should be 6-7.dosire2014-03-211-1/+1
| |
* | Version 6.7.0v6.7.0Marin Jankovski2014-03-211-1/+1
| |
* | Merge branch 'what-is-a-bug' into 'master'Sytse Sijbrandij2014-03-213-9/+10
|\ \ | | | | | | | | | What Is A Bug
| * | Ensure I can link to this line.dosire2014-03-211-1/+4
| | |
| * | Features people are missing are not bugs.dosire2014-03-213-9/+7
| |/
* | Merge branch 'fix-grack-auth' into 'master'Dmitriy Zaporozhets2014-03-212-26/+38
|\ \ | | | | | | | | | Fix http clone for public project
| * | Fix http clone for public projectDmitriy Zaporozhets2014-03-212-26/+38
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'update_upgrade_document' into 'master'Dmitriy Zaporozhets2014-03-213-3/+3
|\ \ | | | | | | | | | | | | | | | Update Upgrade Document for 6.7 Use the latest version of gitlab-shell which is 1.9.0
| * | Use the latest tag, 1.9.1 for gitlab-shell.Marin Jankovski2014-03-213-3/+3
| | |
| * | Checkout gitlab-shell v 1.9.0Marin Jankovski2014-03-211-1/+1
|/ /
* | Merge branch 'dmedvinsky-username-keys-content-type'Dmitriy Zaporozhets2014-03-213-1/+12
|\ \
| * \ Merge branch 'username-keys-content-type' of ↵Dmitriy Zaporozhets2014-03-213-1/+12
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | https://github.com/dmedvinsky/gitlabhq into dmedvinsky-username-keys-content-type Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | Fix `/:username.keys` response content typeDmitry Medvinsky2014-03-203-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently this method responds with `text/html`. It is kind of unusable if you open it in a browser. The browser thinks it is HTML and renders it as HTML, meaning new lines are dropped. So it's very hard to distinguish where the key starts and where it ends. This commit changes the content type header to `text/plain`.
* | | Merge branch 'gitlab_emoji_gem' into 'master'Dmitriy Zaporozhets2014-03-208-11/+14
|\ \ \ | |/ / |/| | | | | Replace gemoji with open source PhantomOpenEmoji
| * | Update ChangelogMarin Jankovski2014-03-203-3/+4
| | |
| * | New bindings to vote on notes.Marin Jankovski2014-03-201-2/+4
| | |
| * | Use new gems methods.Marin Jankovski2014-03-204-6/+3
| | |
| * | Use gitlab_emoji gem instead of gemoji.Marin Jankovski2014-03-202-3/+6
|/ /
* | Merge branch 'cloud-update' into 'master'Dmitriy Zaporozhets2014-03-201-3/+3
|\ \ | | | | | | | | | | | | | | | Cloud Update /cc @jacobvosmaer @marin @job
| * | Run the RC on Cloud.dosire2014-03-191-3/+3
| |/
* | Merge branch 'oauth-require-public-email' into 'master'Dmitriy Zaporozhets2014-03-201-1/+3
|\ \ | | | | | | | | | | | | | | | Oauth Require Public Email Does not fix #976 yet, but will reduce the amount of users getting 422 immensly.
| * | line breakJob van der Voort2014-03-191-0/+1
| | |
| * | require public email with oauth provider messageJob van der Voort2014-03-191-1/+2
| | |
* | | Merge branch 'deploy-key-doc' into 'master'Dmitriy Zaporozhets2014-03-201-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | Deploy Key Doc /cc @marin @job @jacobvosmaer
| * | | Split up the lines for Jacob.dosire2014-03-181-3/+8
| | | |
| * | | Deploy key needed documentation.dosire2014-03-181-0/+7
| | |/ | |/|
* | | GitLab requires gitlab-shell v1.9.0Dmitriy Zaporozhets2014-03-202-1/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'changelog_oreilly' into 'master'Sytse Sijbrandij2014-03-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | Changelog O'Reilly added "Better API for access_levels" sponsorship from O'Reilly to CHANGELOG
| * | | added OReilly sponsorship to CHANGELOGMarc Radulescu2014-03-201-0/+1
|/ / /
* | | Improve grack authDmitriy Zaporozhets2014-03-202-32/+17
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'git-refactoring' into 'master'Dmitriy Zaporozhets2014-03-205-84/+101
|\ \ \ | | | | | | | | | | | | Git Refactoring
| * | | Use 2 workers in developmentDmitriy Zaporozhets2014-03-202-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | push via http now served via /allowed APIDmitriy Zaporozhets2014-03-201-42/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Use GitAccess in internal apiDmitriy Zaporozhets2014-03-201-41/+19
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add Gitlab::GitAccess class to resolve auth issues during pull/pushDmitriy Zaporozhets2014-03-201-0/+74
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | rc1v6.7.0.rc1Dmitriy Zaporozhets2014-03-201-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-204-73/+73
|\ \ \
| * \ \ Merge pull request #6568 from skv-headless/patch-1Sytse Sijbrandij2014-03-191-1/+1
| |\ \ \ | | | | | | | | | | typo fix
| | * | | typo fixEvgeniy Sokovikov2014-03-191-1/+1
| |/ / /
| * | | Merge pull request #6469 from mojavelinux/masterSytse Sijbrandij2014-03-191-1/+1
| |\ \ \ | | | | | | | | | | Add .adoc file extension for AsciiDoc
| | * | | Add .adoc file extension for AsciiDocDan Allen2014-03-041-1/+1
| | | | | | | | | | | | | | | Add .adoc file extension for AsciiDoc as it's a very popular extension to use and the one recommended by the Asciidoctor project.
| * | | | Merge pull request #6457 from lol768/patch-1Sytse Sijbrandij2014-03-191-1/+1
| |\ \ \ \ | | | | | | | | | | | | Fix registration error info typo
| | * | | | Fix registration error info typolol7682014-03-021-1/+1
| | | | | |
| * | | | | Merge pull request #6535 from docwhat/sys-hooks-eolsSytse Sijbrandij2014-03-191-70/+70
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Switched line endings to LF for system_hooks.md
| | * | | | Switched line endings to LF for system_hooks.mdChristian Höltje2014-03-141-70/+70
| | | | | | | | | | | | | | | | | | | | | | | | It was checked in with Windows style line endings.
* | | | | | Merge branch 'someone-asked-us-to-update-the-changelog' into 'master'Dmitriy Zaporozhets2014-03-191-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Someone Asked Us To Update The Changelog
| * | | | | Spinner in changelog.dosire2014-03-191-0/+1
| | |_|_|/ | |/| | |