Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Run db:reset before db:create on CIrs-reset-db | Robert Speicher | 2015-12-09 | 1 | -1/+1 |
* | Merge branch 'master' into 'master' | Robert Speicher | 2015-12-09 | 1 | -2/+1 |
|\ | |||||
| * | Update init script only once | Felix Eckhofer | 2015-12-09 | 1 | -2/+1 |
* | | Merge branch 'rs-default-clone-fixes' into 'master' | Robert Speicher | 2015-12-09 | 2 | -2/+3 |
|\ \ | |||||
| * | | Simplify shared User SSH key steps | Robert Speicher | 2015-12-09 | 1 | -2/+2 |
| * | | Add CHANGELOG entry for !1998 | Robert Speicher | 2015-12-09 | 1 | -0/+1 |
* | | | Merge branch 'split-up-builds' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 211 | -202/+289 |
|\ \ \ | |||||
| * | | | Make sure everyone has shared/lfs-objectssplit-up-builds | Douwe Maan | 2015-12-09 | 1 | -0/+0 |
| * | | | Merge branch 'master' into split-up-builds | Douwe Maan | 2015-12-09 | 50 | -273/+1626 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Split up spec:other even more | Douwe Maan | 2015-12-09 | 2 | -1/+33 |
| * | | | Tag service specs | Douwe Maan | 2015-12-09 | 41 | -41/+41 |
| * | | | Tag lib specs | Douwe Maan | 2015-12-09 | 85 | -86/+86 |
| * | | | Fix rspec tag syntax | Douwe Maan | 2015-12-09 | 1 | -1/+1 |
| * | | | Split up specs more | Douwe Maan | 2015-12-09 | 2 | -2/+18 |
| * | | | Tag model specs | Douwe Maan | 2015-12-09 | 68 | -68/+68 |
| * | | | Split up feature specs more | Douwe Maan | 2015-12-09 | 2 | -5/+32 |
| * | | | Tag feature specs | Douwe Maan | 2015-12-09 | 13 | -1/+13 |
* | | | | Merge branch 'remove-default-branch-option-from-doc' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | Remove default_branch from project API creation since an empty repository | Stan Hu | 2015-12-08 | 1 | -1/+0 |
* | | | | | Merge branch 'rs-list-styling' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 2 | -9/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Improve styling for mixed list stylesrs-list-styling | Robert Speicher | 2015-12-08 | 2 | -9/+11 |
* | | | | | | Merge branch 'buttons-size' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix size of disabled 'New file' buttonbuttons-size | Douwe Maan | 2015-12-09 | 1 | -1/+1 |
* | | | | | | | Merge branch 'remove-redcloth' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 4 | -6/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Fix specremove-redcloth | Douwe Maan | 2015-12-09 | 1 | -1/+1 |
| * | | | | | | Remove RedCloth and no longer allow bundle-audit to fail | Douwe Maan | 2015-12-09 | 3 | -5/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'default_clone_protocol_based_on_user_keys' into 'master' | Robert Speicher | 2015-12-09 | 6 | -4/+41 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into default_clone_protocol_based_on_user_keys | Eirik Lygre | 2015-12-09 | 244 | -1097/+4013 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Move ssh-key steps into SharedUser. Change references in "Explore Projects" f... | Eirik Lygre | 2015-12-09 | 5 | -10/+14 |
| * | | | | | | Add spinach tests for the clone protocol selection. | Eirik Lygre | 2015-12-09 | 2 | -2/+27 |
| * | | | | | | Simplify expression per feedback from @rspeicher | Eirik Lygre | 2015-12-07 | 1 | -3/+1 |
| * | | | | | | When rendering the clone page, check user profile to decide default clone pro... | Eirik Lygre | 2015-12-06 | 1 | -2/+12 |
* | | | | | | | Merge branch 'fix-admin-should-be-able-to-add-himself-to-group' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 7 | -8/+107 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group | Douglas Barbosa Alexandre | 2015-12-08 | 137 | -738/+1911 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group | Douglas Barbosa Alexandre | 2015-12-04 | 138 | -660/+943 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group | Douglas Barbosa Alexandre | 2015-12-03 | 104 | -524/+629 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2015-12-01 | 1 | -0/+1 |
| * | | | | | | | | | Signed in admin should be able to add/remove himself to a project | Douglas Barbosa Alexandre | 2015-12-01 | 3 | -4/+55 |
| * | | | | | | | | | Signed in admin should be able to add/remove himself to a group | Douglas Barbosa Alexandre | 2015-12-01 | 4 | -4/+51 |
* | | | | | | | | | | Merge branch 'fix-workhorse-upgrade-info' into 'master' | Jacob Vosmaer | 2015-12-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove the prepended v on GitLab Workhorse upgrade docfix-workhorse-upgrade-info | Kelvin | 2015-12-08 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'merge-if-green' into 'master' | Douwe Maan | 2015-12-09 | 38 | -158/+715 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Tweak specsmerge-if-green | Douwe Maan | 2015-12-09 | 1 | -8/+2 |
| * | | | | | | | | | | Give merge request widget the vars it desires | Douwe Maan | 2015-12-09 | 1 | -0/+5 |
| * | | | | | | | | | | Merge branch 'master' into merge-if-green | Douwe Maan | 2015-12-09 | 49 | -232/+377 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Tweak text of documentation | Douwe Maan | 2015-12-08 | 2 | -4/+3 |
| * | | | | | | | | | | Merge branch 'master' into merge-if-green | Douwe Maan | 2015-12-08 | 79 | -261/+955 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into zj/gitlab-ce-merge-if-green | Douwe Maan | 2015-12-08 | 17 | -22/+148 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Rewrite docs | Douwe Maan | 2015-12-08 | 6 | -12/+8 |
| * | | | | | | | | | | | Merge branch 'master' into zj/gitlab-ce-merge-if-green | Douwe Maan | 2015-12-08 | 89 | -319/+917 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | |