Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'revert-satellites' into 'master' | Dmitriy Zaporozhets | 2015-08-11 | 13 | -46/+290 |
|\ | |||||
| * | Fix file api tests | Dmitriy Zaporozhets | 2015-08-11 | 1 | -22/+8 |
| * | Revert "Merge branch 'web-editor-rugged' into 'master'" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -4/+48 |
| * | Revert "Merge branch 'refactor-can-be-merge' into 'master'" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -14/+0 |
| * | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 13 | -30/+258 |
* | | Merge branch 'fix-diff-highlighting' into 'master' | Douwe Maan | 2015-08-10 | 2 | -1/+17 |
|\ \ | |||||
| * | | Fix diff syntax highlighting | Stan Hu | 2015-08-10 | 2 | -1/+17 |
| |/ | |||||
* | | Merge branch 'disable-autocrlf-for-binary-files' into 'master' | Stan Hu | 2015-08-10 | 1 | -0/+31 |
|\ \ | |/ |/| | |||||
| * | Fix corrupted binary files when using API files endpoint | Stan Hu | 2015-08-09 | 1 | -0/+31 |
* | | Merge branch 'rs-reference-data-attrs' into 'master' | Robert Speicher | 2015-08-10 | 7 | -0/+64 |
|\ \ | |/ |/| | |||||
| * | Add `data-[type]-id` attribute to reference linksrs-reference-data-attrs | Robert Speicher | 2015-08-08 | 7 | -0/+64 |
* | | Merge branch 'merge-notifs' into 'master' | Robert Speicher | 2015-08-07 | 1 | -1/+6 |
|\ \ | |||||
| * \ | Merge branch 'master' into merge-notifsmerge-notifs | Douwe Maan | 2015-08-06 | 33 | -601/+764 |
| |\ \ | |||||
| * | | | Send notification to all participants when MR is merged. | Douwe Maan | 2015-07-30 | 1 | -1/+6 |
* | | | | Merge branch 'bitbucket-show-incompatible' into 'master' | Douwe Maan | 2015-08-07 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Show incompatible projects in Bitbucket import status | Stan Hu | 2015-08-07 | 1 | -1/+3 |
| | |_|/ | |/| | | |||||
* | | | | Add `Group#add_*` convenience methodsrs-group-convenience-methods | Robert Speicher | 2015-08-07 | 6 | -9/+9 |
|/ / / | |||||
* | | | Merge branch 'add-current-user-to-autocomplete' into 'master' | Dmitriy Zaporozhets | 2015-08-06 | 1 | -0/+22 |
|\ \ \ | |||||
| * | | | Always add current user to autocomplete controller to support filter by "Me" | Stan Hu | 2015-08-06 | 1 | -0/+22 |
* | | | | Merge branch 'report-spam' | Dmitriy Zaporozhets | 2015-08-06 | 2 | -0/+16 |
|\ \ \ \ | |||||
| * | | | | Allow users to send abuse reports | Dmitriy Zaporozhets | 2015-08-06 | 2 | -0/+16 |
* | | | | | Fix spec | Douwe Maan | 2015-08-06 | 1 | -2/+2 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'remove-email-from-published-keys' into 'master' | Douwe Maan | 2015-08-06 | 3 | -1/+19 |
|\ \ \ \ | |||||
| * | | | | Only publish ssh key-type and key | Zeger-Jan van de Weg | 2015-08-04 | 3 | -1/+19 |
* | | | | | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master' | Douwe Maan | 2015-08-06 | 2 | -0/+30 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix "Network" and "Graphs" pages for branches with encoded slashes | Stan Hu | 2015-08-02 | 1 | -0/+10 |
| * | | | | Fix errors deleting and creating branches with encoded slashes | Stan Hu | 2015-08-01 | 1 | -0/+20 |
* | | | | | Merge branch 'drop-satellites' | Dmitriy Zaporozhets | 2015-08-05 | 13 | -258/+30 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fix merge request creation without branch selected | Dmitriy Zaporozhets | 2015-08-05 | 1 | -5/+0 |
| * | | | | Improve tests to use real branches in merge requests | Dmitriy Zaporozhets | 2015-08-04 | 4 | -13/+13 |
| * | | | | Merge branch 'master' into drop-satellites | Dmitriy Zaporozhets | 2015-08-04 | 46 | -809/+1251 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Fix merge api and spec | Dmitriy Zaporozhets | 2015-08-04 | 1 | -14/+12 |
| * | | | | Fix some of tests | Dmitriy Zaporozhets | 2015-07-16 | 3 | -4/+4 |
| * | | | | Remove satellites | Dmitriy Zaporozhets | 2015-07-15 | 4 | -222/+1 |
* | | | | | Merge branch 'revert_touch' into 'master' | Sytse Sijbrandij | 2015-08-05 | 2 | -5/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "Update noteable after a new note is added"revert_touch | Valery Sizov | 2015-08-05 | 2 | -5/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Add "Confirm user" button in user admin page | Stan Hu | 2015-08-05 | 2 | -0/+27 |
|/ / / / | |||||
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-08-03 | 12 | -324/+615 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Stan Hu | 2015-08-02 | 4 | -3/+9 |
| |\ \ \ \ | |||||
| | * | | | | Re-annotate models | Atsushi Ishida | 2015-08-03 | 4 | -3/+9 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'api-useremails' into 'master' | Robert Speicher | 2015-07-31 | 1 | -0/+171 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch 'master' into api-useremails | Douwe Maan | 2015-07-31 | 7 | -321/+417 |
| | |\ \ \ | |||||
| | * | | | | Fix docs | Douwe Maan | 2015-07-30 | 1 | -1/+1 |
| | * | | | | Add ability to manage user email addresses via the API. | Douwe Maan | 2015-07-29 | 1 | -0/+171 |
| * | | | | | Fix multi-line syntax highlighting | Stan Hu | 2015-07-30 | 1 | -0/+18 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'rs-mr-1050-followup' into 'master' | Robert Speicher | 2015-07-31 | 1 | -0/+16 |
| |\ \ \ \ | |||||
| | * | | | | Add spec to RelativeLinkFilter for Unicode filenames | Robert Speicher | 2015-07-30 | 1 | -0/+16 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'rs-markdown-feature-pipelines' into 'master' | Robert Speicher | 2015-07-31 | 4 | -314/+388 |
| |\ \ \ \ | |||||
| | * | | | | Fix setup/teardown for Markdown feature specrs-markdown-feature-pipelines | Robert Speicher | 2015-07-29 | 2 | -24/+9 |
| | * | | | | Update Markdown feature to allow for multiple pipelines | Robert Speicher | 2015-07-28 | 2 | -163/+209 |