summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'commit-header' into 'master' Jacob Schatz2016-06-172-2/+4
|\
| * Fixed issue with dropdown buttonscommit-headerPhil Hughes2016-06-171-1/+1
| * Use line-height instead of height.Jacob Schatz2016-06-172-3/+3
| * Fixes header vertical centering.Jacob Schatz2016-06-171-0/+2
* | Merge branch 'fix-todos-counters' into 'master' Robert Speicher2016-06-173-16/+11
|\ \
| * | Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-173-16/+11
* | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-172-4/+8
|\ \ \
| * | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-142-4/+8
* | | | Merge branch 'repo-check-require-push-events' into 'master' Robert Speicher2016-06-171-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Do not check repos without push eventsJacob Vosmaer2016-06-151-1/+5
* | | | Merge branch '18034-cache-todo-counter' into 'master' Yorick Peterse2016-06-175-9/+36
|\ \ \ \
| * | | | Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-175-9/+36
* | | | | Fixed issue with assignee dropdown not selecting correctlyPhil Hughes2016-06-171-1/+1
* | | | | Merge branch 'clipboard-buttons-fix' into 'master' Robert Speicher2016-06-172-3/+13
|\ \ \ \ \
| * | | | | Fix clibpoard buttons on "Check out branch" modal.clipboard-buttons-fixConnor Shea2016-06-172-3/+13
| |/ / / /
* | | | | Merge branch 'clipboard-button-styling' into 'master' Robert Speicher2016-06-171-1/+1
|\ \ \ \ \
| * | | | | Fixed styling of clipboard buttonclipboard-button-stylingPhil Hughes2016-06-171-1/+1
| | |_|_|/ | |/| | |
* | | | | Fix a 'wrong number of arguments' errorRémy Coutable2016-06-171-1/+1
| |/ / / |/| | |
* | | | Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master' Robert Speicher2016-06-171-1/+6
|\ \ \ \
| * | | | Fix error when editing an issuable with a task listfix-toggling-task-should-not-generate-todoDouglas Barbosa Alexandre2016-06-171-1/+6
* | | | | Merge branch 'contrib-calendar-colors' into 'master' Jacob Schatz2016-06-171-11/+6
|\ \ \ \ \
| * | | | | Fixed issue with user calendar colorscontrib-calendar-colorsPhil Hughes2016-06-131-11/+6
* | | | | | 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-173-4/+36
|\ \ \ \ \ \ \
| * | | | | | | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-163-4/+36
* | | | | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-1727-31/+402
|\ \ \ \ \ \ \ \
| * | | | | | | | a few changes based on MR feedbackJames Lopez2016-06-174-9/+15
| * | | | | | | | fixed merge conflicts on UI branchJames Lopez2016-06-16225-1866/+2825
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ fixed merge conflictsJames Lopez2016-06-16225-1860/+2819
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-16225-1860/+2819
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-16225-2819/+1860
| | | * | | | | | | | | squashed merge and fixed conflictsJames Lopez2016-06-16225-1860/+2819
| * | | | | | | | | | | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-1511-59/+98
| * | | | | | | | | | | fixing specs and some code cleanupJames Lopez2016-06-153-4/+8
| * | | | | | | | | | | cleanup namespace check now done by serviceJames Lopez2016-06-151-11/+0
| * | | | | | | | | | | enable retry on workerJames Lopez2016-06-151-2/+1
| * | | | | | | | | | | some refactoring - renaming things, etc..James Lopez2016-06-152-5/+5
| * | | | | | | | | | | project export archiverJames Lopez2016-06-143-3/+19
| * | | | | | | | | | | get rid of old workerJames Lopez2016-06-141-24/+0
| * | | | | | | | | | | yay finally importing working with the new services structureJames Lopez2016-06-141-1/+1
| * | | | | | | | | | | few fixes after refactoring the whole UI stuffJames Lopez2016-06-142-4/+4
| * | | | | | | | | | | adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-143-15/+20
| * | | | | | | | | | | adding notifications stuff and more refactoring for exporting projectsJames Lopez2016-06-1411-6/+63
| * | | | | | | | | | | new export stuff and viewJames Lopez2016-06-143-11/+25
| * | | | | | | | | | | lots of refactoring to reuse import serviceJames Lopez2016-06-148-18/+34
| * | | | | | | | | | | WIP - starting refactoring import/export to use servicesJames Lopez2016-06-133-5/+25
| * | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-13645-6219/+9079
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | fixed specs and refactored a few things due to recent model changes and merge...James Lopez2016-06-132-3/+5
| | * | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-13644-6182/+9061
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /