summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Run db:reset before db:create on CIrs-reset-dbRobert Speicher2015-12-091-1/+1
* Merge branch 'master' into 'master' Robert Speicher2015-12-091-2/+1
|\
| * Update init script only onceFelix Eckhofer2015-12-091-2/+1
* | Merge branch 'rs-default-clone-fixes' into 'master' Robert Speicher2015-12-092-2/+3
|\ \
| * | Simplify shared User SSH key stepsRobert Speicher2015-12-091-2/+2
| * | Add CHANGELOG entry for !1998Robert Speicher2015-12-091-0/+1
* | | Merge branch 'split-up-builds' into 'master' Dmitriy Zaporozhets2015-12-09211-202/+289
|\ \ \
| * | | Make sure everyone has shared/lfs-objectssplit-up-buildsDouwe Maan2015-12-091-0/+0
| * | | Merge branch 'master' into split-up-buildsDouwe Maan2015-12-0950-273/+1626
| |\ \ \ | | | |/ | | |/|
| * | | Split up spec:other even moreDouwe Maan2015-12-092-1/+33
| * | | Tag service specsDouwe Maan2015-12-0941-41/+41
| * | | Tag lib specsDouwe Maan2015-12-0985-86/+86
| * | | Fix rspec tag syntaxDouwe Maan2015-12-091-1/+1
| * | | Split up specs moreDouwe Maan2015-12-092-2/+18
| * | | Tag model specsDouwe Maan2015-12-0968-68/+68
| * | | Split up feature specs moreDouwe Maan2015-12-092-5/+32
| * | | Tag feature specsDouwe Maan2015-12-0913-1/+13
* | | | Merge branch 'remove-default-branch-option-from-doc' into 'master' Dmitriy Zaporozhets2015-12-091-1/+0
|\ \ \ \
| * | | | Remove default_branch from project API creation since an empty repositoryStan Hu2015-12-081-1/+0
* | | | | Merge branch 'rs-list-styling' into 'master' Dmitriy Zaporozhets2015-12-092-9/+11
|\ \ \ \ \
| * | | | | Improve styling for mixed list stylesrs-list-stylingRobert Speicher2015-12-082-9/+11
* | | | | | Merge branch 'buttons-size' into 'master' Dmitriy Zaporozhets2015-12-091-1/+1
|\ \ \ \ \ \
| * | | | | | Fix size of disabled 'New file' buttonbuttons-sizeDouwe Maan2015-12-091-1/+1
* | | | | | | Merge branch 'remove-redcloth' into 'master' Dmitriy Zaporozhets2015-12-094-6/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix specremove-redclothDouwe Maan2015-12-091-1/+1
| * | | | | | Remove RedCloth and no longer allow bundle-audit to failDouwe Maan2015-12-093-5/+1
| |/ / / / /
* | | | | | Merge branch 'default_clone_protocol_based_on_user_keys' into 'master' Robert Speicher2015-12-096-4/+41
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into default_clone_protocol_based_on_user_keysEirik Lygre2015-12-09244-1097/+4013
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Move ssh-key steps into SharedUser. Change references in "Explore Projects" f...Eirik Lygre2015-12-095-10/+14
| * | | | | | Add spinach tests for the clone protocol selection.Eirik Lygre2015-12-092-2/+27
| * | | | | | Simplify expression per feedback from @rspeicherEirik Lygre2015-12-071-3/+1
| * | | | | | When rendering the clone page, check user profile to decide default clone pro...Eirik Lygre2015-12-061-2/+12
* | | | | | | Merge branch 'fix-admin-should-be-able-to-add-himself-to-group' into 'master' Dmitriy Zaporozhets2015-12-097-8/+107
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-08137-738/+1911
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-04138-660/+943
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-03104-524/+629
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2015-12-011-0/+1
| * | | | | | | | | Signed in admin should be able to add/remove himself to a projectDouglas Barbosa Alexandre2015-12-013-4/+55
| * | | | | | | | | Signed in admin should be able to add/remove himself to a groupDouglas Barbosa Alexandre2015-12-014-4/+51
* | | | | | | | | | Merge branch 'fix-workhorse-upgrade-info' into 'master' Jacob Vosmaer2015-12-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Remove the prepended v on GitLab Workhorse upgrade docfix-workhorse-upgrade-infoKelvin2015-12-081-1/+1
* | | | | | | | | | Merge branch 'merge-if-green' into 'master' Douwe Maan2015-12-0938-158/+715
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Tweak specsmerge-if-greenDouwe Maan2015-12-091-8/+2
| * | | | | | | | | | Give merge request widget the vars it desiresDouwe Maan2015-12-091-0/+5
| * | | | | | | | | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-0949-232/+377
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Tweak text of documentationDouwe Maan2015-12-082-4/+3
| * | | | | | | | | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-0879-261/+955
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-0817-22/+148
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Rewrite docsDouwe Maan2015-12-086-12/+8
| * | | | | | | | | | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-0889-319/+917
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |