Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 10 | -5/+520 |
* | Merge branch 'rs-reference-data-attrs' into 'master' | Robert Speicher | 2015-08-10 | 8 | -8/+32 |
|\ | |||||
| * | Add `data-[type]-id` attribute to reference linksrs-reference-data-attrs | Robert Speicher | 2015-08-08 | 8 | -8/+32 |
* | | Merge branch 'bitbucket-show-incompatible' into 'master' | Douwe Maan | 2015-08-07 | 1 | -0/+4 |
|\ \ | |||||
| * | | Show incompatible projects in Bitbucket import status | Stan Hu | 2015-08-07 | 1 | -0/+4 |
| |/ | |||||
* | | Merge branch 'master' into comment-updated-by | Douwe Maan | 2015-08-06 | 15 | -533/+141 |
|\ \ | |/ | |||||
| * | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master' | Douwe Maan | 2015-08-06 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix "Network" and "Graphs" pages for branches with encoded slashes | Stan Hu | 2015-08-02 | 1 | -1/+1 |
| * | | Merge branch 'drop-satellites' | Dmitriy Zaporozhets | 2015-08-05 | 10 | -520/+5 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into drop-satellites | Dmitriy Zaporozhets | 2015-08-04 | 24 | -118/+484 |
| | |\ \ | |||||
| | * | | | Fix merge api and spec | Dmitriy Zaporozhets | 2015-08-04 | 1 | -1/+1 |
| | * | | | Huge refactoring for accepting merge requests | Dmitriy Zaporozhets | 2015-07-16 | 1 | -1/+5 |
| | * | | | Fix application initialize | Dmitriy Zaporozhets | 2015-07-15 | 1 | -0/+4 |
| | * | | | Remove satellites | Dmitriy Zaporozhets | 2015-07-15 | 9 | -523/+0 |
| * | | | | Merge branch 'rs-fix-rouge-inline-theme' into 'master' | Stan Hu | 2015-08-04 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Fix the `inline_theme` option for the Rouge formatterrs-fix-rouge-inline-theme | Robert Speicher | 2015-08-01 | 1 | -1/+1 |
| * | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-08-03 | 10 | -22/+173 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'api-useremails' into 'master' | Robert Speicher | 2015-07-31 | 2 | -6/+121 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Fix indentation | Douwe Maan | 2015-07-31 | 1 | -11/+11 |
| | | * | | Merge branch 'master' into api-useremails | Douwe Maan | 2015-07-31 | 8 | -14/+42 |
| | | |\ \ | |||||
| | | * | | | Add ability to manage user email addresses via the API. | Douwe Maan | 2015-07-29 | 2 | -0/+115 |
| | * | | | | Fix multi-line syntax highlighting | Stan Hu | 2015-07-30 | 1 | -2/+10 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-p... | Jacob Vosmaer | 2015-07-29 | 13 | -95/+300 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-p... | Jacob Vosmaer | 2015-07-27 | 13 | -30/+103 |
| |\ \ \ \ | |||||
| * | | | | | Allow custom backup archive permissions | Jacob Vosmaer | 2015-07-06 | 1 | -3/+3 |
* | | | | | | Merge branch 'master' into comment-updated-by | Douwe Maan | 2015-07-31 | 8 | -14/+42 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'rs-mr-1050-followup' into 'master' | Robert Speicher | 2015-07-31 | 1 | -2/+11 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add spec to RelativeLinkFilter for Unicode filenames | Robert Speicher | 2015-07-30 | 1 | -2/+11 |
| * | | | | | | Merge branch 'api-new-attributes' into 'master' | Robert Speicher | 2015-07-30 | 1 | -0/+10 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | No more web url | Douwe Maan | 2015-07-30 | 1 | -2/+10 |
| | * | | | | | Merge branch 'master' into api-new-attributes | Douwe Maan | 2015-07-29 | 7 | -12/+257 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | * | | | | | Add project star and fork count, group avatar URL and user/group web URL attr... | Douwe Maan | 2015-07-28 | 1 | -1/+3 |
| * | | | | | | Merge branch 'fix-image-file-is-not-displayed' into 'master' | Robert Speicher | 2015-07-30 | 1 | -2/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix the image file that contains non-ascii character is not displayed | Hiroyuki Sato | 2015-07-27 | 1 | -2/+3 |
| * | | | | | | | Merge branch 'backup-directory-permissions' into 'master' | Stan Hu | 2015-07-30 | 4 | -6/+14 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Stricter mkdir's in 'rake gitlab:backup:create'backup-directory-permissions | Jacob Vosmaer | 2015-07-30 | 3 | -4/+14 |
| | * | | | | | | | Set internal backup directory modes on create | Jacob Vosmaer | 2015-07-29 | 4 | -5/+3 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'fix-rake-check-hooks' into 'master' | Jacob Vosmaer | 2015-07-30 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Check that hooks directory exists before attempting to call realpath | Stan Hu | 2015-07-30 | 1 | -4/+4 |
| | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Check that project was actually created rather than just validated in import:... | Stan Hu | 2015-07-29 | 1 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Show who last edited a comment if it wasn't the original author | Douwe Maan | 2015-07-30 | 1 | -7/+5 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Valery Sizov | 2015-07-29 | 4 | -2/+70 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix style points | GitLab | 2015-07-28 | 2 | -8/+7 |
| * | | | | | | Send GL_ID to gitlab-git-http-server as JSON | GitLab | 2015-07-28 | 1 | -3/+4 |
| * | | | | | | Handle missing @user during Git HTTP requests | GitLab | 2015-07-28 | 1 | -1/+10 |
| * | | | | | | Experimental support for gitlab-git-http-server | Jacob Vosmaer | 2015-07-28 | 4 | -2/+61 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #9341 from rumpelsepp/rouge | Stan Hu | 2015-07-28 | 2 | -4/+172 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add HTMLGitlab formatter | Stefan Tatschner | 2015-07-29 | 1 | -0/+168 |
| * | | | | | | Replace Rugments with Rouge | Stefan Tatschner | 2015-07-29 | 1 | -4/+4 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Fix bug causing Bitbucket importer to crash when OAuth application had been r...bitbucket-re-authorize | Douwe Maan | 2015-07-28 | 1 | -6/+15 |
|/ / / / / |