Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'issue_12758' into 'master' | Douwe Maan | 2016-06-17 | 1 | -2/+8 |
|\ | |||||
| * | Merge master into issue_12758issue_12758 | Felipe Artur | 2016-06-17 | 3 | -0/+9 |
| |\ | |||||
| * \ | Re-use notifications dropdown/modal for user profile | Felipe Artur | 2016-06-17 | 1 | -2/+8 |
| |\ \ | |||||
| | * | | Re-use notifications dropdown on user profile | Felipe Artur | 2016-06-16 | 1 | -2/+8 |
* | | | | Merge branch 'issuable-todo-improvements' | Douwe Maan | 2016-06-18 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Removed update methodissuable-todo-improvements | Phil Hughes | 2016-06-17 | 1 | -1/+1 |
| * | | | | Improved manual todos | Phil Hughes | 2016-06-17 | 1 | -1/+1 |
* | | | | | Merge branch 'feature/project-export' into 'master' | Douwe Maan | 2016-06-17 | 2 | -0/+11 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | a few changes based on MR feedback | James Lopez | 2016-06-17 | 1 | -0/+1 |
| * | | | | fixed merge conflicts on UI branch | James Lopez | 2016-06-16 | 7 | -14/+48 |
| |\ \ \ \ | |||||
| | * \ \ \ | fixed merge conflicts | James Lopez | 2016-06-16 | 7 | -14/+48 |
| | |\ \ \ \ | |||||
| * | | | | | | lots of refactoring again based on feedback. Changed the UI slightly and also... | James Lopez | 2016-06-15 | 1 | -0/+1 |
| * | | | | | | some refactoring - renaming things, etc.. | James Lopez | 2016-06-15 | 1 | -3/+3 |
| * | | | | | | project export archiver | James Lopez | 2016-06-14 | 1 | -0/+3 |
| * | | | | | | adapted current services stuff to use new project import, plus fixes a few is... | James Lopez | 2016-06-14 | 1 | -1/+1 |
| * | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-06-13 | 22 | -120/+355 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla... | James Lopez | 2016-06-13 | 22 | -120/+355 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | updated routes for gitlab_projects | James Lopez | 2016-05-17 | 1 | -4/+2 |
| * | | | | | | | updated routes for gitlab_project | James Lopez | 2016-05-17 | 1 | -1/+1 |
| * | | | | | | | updated routes file | James Lopez | 2016-05-13 | 1 | -2/+0 |
| * | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-09 | 5 | -18/+25 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-09 | 5 | -18/+25 |
| | |\ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-03 | 10 | -16/+73 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-03 | 10 | -16/+73 |
| | |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | | more refactoring, now using custom job for processing project imports | James Lopez | 2016-04-26 | 1 | -0/+1 |
| * | | | | | | | | | refactoring, mainly UI stuff to follow other import actions | James Lopez | 2016-04-26 | 1 | -1/+0 |
| * | | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-04-25 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project... | James Lopez | 2016-04-25 | 2 | -0/+5 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | changes to be picked by the UI branch | James Lopez | 2016-04-25 | 1 | -0/+6 |
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project... | James Lopez | 2016-04-22 | 2 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' into fea... | James Lopez | 2016-04-22 | 6 | -7/+51 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | download export now working | James Lopez | 2016-04-15 | 1 | -0/+1 |
| * | | | | | | | | | | some experimental UI stuff to test export | James Lopez | 2016-04-14 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch '2979-personal-access-tokens' into 'master' | Douwe Maan | 2016-06-17 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens | Timothy Andrew | 2016-06-16 | 6 | -7/+36 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens | Timothy Andrew | 2016-06-14 | 4 | -9/+14 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens | Timothy Andrew | 2016-06-10 | 1 | -17/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens | Timothy Andrew | 2016-06-09 | 6 | -9/+233 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens | Timothy Andrew | 2016-06-03 | 17 | -97/+103 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Minor fixes after a final look at the diff. | Timothy Andrew | 2016-05-11 | 1 | -4/+0 |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens | Timothy Andrew | 2016-05-11 | 11 | -36/+77 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Allow revoking personal access tokens. | Timothy Andrew | 2016-04-28 | 2 | -1/+9 |
| * | | | | | | | | | | | | | | Allow creating Personal Access Tokens through the website. | Timothy Andrew | 2016-04-28 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | Fix images in emails18474-missing-images-on-confirmation-email | Sean McGivern | 2016-06-16 | 1 | -0/+1 |
| |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'network-assets' into 'master' | Jacob Schatz | 2016-06-15 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Replace raphael-rails with raphael.js so it can be split from the rest of the... | Connor Shea | 2016-06-10 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'environments-and-deployments' into 'master' | Rémy Coutable | 2016-06-15 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into environments-and-deployments | Kamil Trzcinski | 2016-06-14 | 4 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into environments-and-deployments | Kamil Trzcinski | 2016-06-14 | 2 | -7/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add deployment views | Kamil Trzcinski | 2016-06-11 | 1 | -1/+1 |