summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'commit-header' into 'master' Jacob Schatz2016-06-171-2/+2
|\
| * Fixed issue with dropdown buttonscommit-headerPhil Hughes2016-06-171-1/+1
| * Use line-height instead of height.Jacob Schatz2016-06-171-1/+1
* | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-171-3/+7
|\ \
| * | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-141-3/+7
* | | Fixed issue with assignee dropdown not selecting correctlyPhil Hughes2016-06-171-1/+1
* | | Fix clibpoard buttons on "Check out branch" modal.clipboard-buttons-fixConnor Shea2016-06-171-3/+3
* | | Merge branch '18724-dont-show-leave-project-to-group-member' into 'master' Douwe Maan2016-06-171-2/+3
|\ \ \
| * | | Don't show 'Leave Project' to group members18724-dont-show-leave-project-to-group-memberRémy Coutable2016-06-171-2/+3
* | | | Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master' Rémy Coutable2016-06-171-2/+13
|\ \ \ \
| * | | | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-161-2/+13
* | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-178-2/+124
|\ \ \ \ \
| * | | | | a few changes based on MR feedbackJames Lopez2016-06-172-2/+2
| * | | | | fixed merge conflicts on UI branchJames Lopez2016-06-16114-1080/+1227
| |\ \ \ \ \ | | |/ / / /
| * | | | | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-156-35/+53
| * | | | | fixing specs and some code cleanupJames Lopez2016-06-153-4/+8
| * | | | | few fixes after refactoring the whole UI stuffJames Lopez2016-06-141-1/+1
| * | | | | adding notifications stuff and more refactoring for exporting projectsJames Lopez2016-06-144-0/+26
| * | | | | new export stuff and viewJames Lopez2016-06-141-1/+19
| * | | | | lots of refactoring to reuse import serviceJames Lopez2016-06-141-0/+13
| * | | | | WIP - starting refactoring import/export to use servicesJames Lopez2016-06-132-1/+4
| * | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-13305-2317/+2975
| |\ \ \ \ \
| * | | | | | a few nice to have and updated changelogJames Lopez2016-05-201-1/+1
| * | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-0968-175/+146
| |\ \ \ \ \ \
| * | | | | | | typos in export pageJames Lopez2016-05-041-3/+3
| * | | | | | | typoJames Lopez2016-05-031-2/+2
| * | | | | | | typoJames Lopez2016-05-031-1/+1
| * | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-0339-515/+536
| |\ \ \ \ \ \ \
| * | | | | | | | fixing issues with project members mapping. Also added some more JS magic to ...James Lopez2016-05-021-0/+11
| * | | | | | | | refactoring and fixing a bunch of stuffJames Lopez2016-05-021-55/+0
| * | | | | | | | some JS magic to pass namespace and path importing projectsJames Lopez2016-04-272-1/+8
| * | | | | | | | adding more UI changes, updated controller, worker and refactored import serviceJames Lopez2016-04-261-1/+1
| * | | | | | | | more refactoring, now using custom job for processing project importsJames Lopez2016-04-261-1/+1
| * | | | | | | | refactoring, mainly UI stuff to follow other import actionsJames Lopez2016-04-264-11/+73
| * | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-04-251-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | gitlab import UI - icon, file selector, etc... Also updated font-awesome and ...James Lopez2016-04-222-1/+16
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-04-2213-61/+87
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branches 'feature/project-export' and 'feature/project-import' into fea...James Lopez2016-04-22123-581/+814
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | download export now workingJames Lopez2016-04-151-2/+5
| * | | | | | | | | | | some experimental UI stuff to test exportJames Lopez2016-04-141-0/+13
* | | | | | | | | | | | Merge branch '2979-personal-access-tokens' into 'master' Douwe Maan2016-06-172-0/+109
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-16103-1037/+1213
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implement @DouweM's feedback.Timothy Andrew2016-06-162-13/+3
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-1439-401/+347
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-1025-95/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Implement second round of comments from @jschatz1.Timothy Andrew2016-06-101-5/+6
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-09114-763/+1089
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Implement @jschatz1's comments.Timothy Andrew2016-06-091-16/+33
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-03224-1414/+1799
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Display appropriate errors when personal access token creation/revocation fails.Timothy Andrew2016-06-031-0/+2