summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Rename commit_data in Pipeline to commitfix/builds-api-nil-commitGrzegorz Bizon2016-06-212-12/+6
* Fix builds API response not including commit dataGrzegorz Bizon2016-06-211-0/+8
* Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-212-9/+22
|\
| * Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-2017-16/+173
| |\
| * | Rename according to:Lin Jen-Shin2016-06-201-3/+3
| * | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-1723-162/+369
| |\ \
| * | | Use FIXME instead, feedback from:Lin Jen-Shin2016-06-161-2/+2
| * | | Return the association and check it in controller instead:Lin Jen-Shin2016-06-141-1/+1
| * | | Merge branch 'prefer-assign_to' into feature/runner-lock-on-projectLin Jen-Shin2016-06-141-1/+1
| |\ \ \
| | * | | Give 409 Conflict whenever the runner was already enabledprefer-assign_toLin Jen-Shin2016-06-141-1/+1
| | * | | We're checking return value rather than rescuing exceptionsLin Jen-Shin2016-06-141-1/+1
| * | | | Merge branch 'master' into feature/runner-lock-on-projectLin Jen-Shin2016-06-148-51/+116
| |\ \ \ \ | | |/ / /
| * | | | Rename specific_for to available_for:Lin Jen-Shin2016-06-141-1/+1
| * | | | Merge conditions. Not worth an additional pointless method:Lin Jen-Shin2016-06-091-9/+3
| * | | | Renamed to available_for? Feedback from:Lin Jen-Shin2016-06-091-2/+2
| * | | | Remove Build#can_be_served? and rename Runner#can_serve? to can_pick?Lin Jen-Shin2016-06-092-6/+2
| * | | | Manually build the SQL so that it properly skips Rails.Lin Jen-Shin2016-06-091-1/+2
| * | | | Found a workaround for that weird SQL error:Lin Jen-Shin2016-06-091-1/+3
| * | | | WIP, try to add views for locked runnersLin Jen-Shin2016-06-091-1/+1
| * | | | Introduced Ci::Runner.specific_for for getting specific runners:Lin Jen-Shin2016-06-091-0/+4
| * | | | Implement the logic for locking runnerLin Jen-Shin2016-06-092-3/+19
* | | | | Get ref_names from branch_names/tag_names cachedPaco Guzman2016-06-201-0/+4
* | | | | Unify check branch name existPaco Guzman2016-06-202-7/+3
| |_|_|/ |/| | |
* | | | Remove Duplicated keys add UNIQUE index to fingerprint18697-uniqueness-key-validationPaco Guzman2016-06-201-1/+1
* | | | Fix RangeError exceptions when referring to issues or merge requests outside ...Stan Hu2016-06-183-0/+12
* | | | Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-171-1/+36
|\ \ \ \
| * \ \ \ Merge master into issue_12758issue_12758Felipe Artur2016-06-179-25/+76
| |\ \ \ \
| * | | | | Implement custom notification level optionsFelipe Artur2016-06-151-1/+36
* | | | | | Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-171-0/+17
* | | | | | Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master' Rémy Coutable2016-06-171-0/+19
|\ \ \ \ \ \
| * | | | | | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-161-0/+19
* | | | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-179-14/+61
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | a few changes based on MR feedbackJames Lopez2016-06-171-1/+1
| * | | | | | fixed merge conflicts on UI branchJames Lopez2016-06-1624-172/+344
| |\ \ \ \ \ \
| | * \ \ \ \ \ fixed merge conflictsJames Lopez2016-06-1624-172/+344
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-1624-172/+344
| | | |\ \ \ \ \ \
| | | * | | | | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-1624-344/+172
| | | * | | | | | | squashed merge and fixed conflictsJames Lopez2016-06-1624-172/+344
| * | | | | | | | | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-151-2/+11
| * | | | | | | | | some refactoring - renaming things, etc..James Lopez2016-06-151-3/+3
| * | | | | | | | | project export archiverJames Lopez2016-06-141-0/+9
| * | | | | | | | | adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-141-1/+1
| * | | | | | | | | new export stuff and viewJames Lopez2016-06-141-10/+0
| * | | | | | | | | lots of refactoring to reuse import serviceJames Lopez2016-06-142-4/+4
| * | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-1398-2256/+1284
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | 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-1397-2243/+1268
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | refactored loads of things due to commits to pipeline changeJames Lopez2016-06-131-4/+4
| | | * | | | | | | Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org...James Lopez2016-06-1321-165/+398
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | WIP - added missing notes, trying to fix specsJames Lopez2016-06-031-0/+4
View Lorry Controller Status