summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-251-1/+1
* Merge branch 'zj-fix-pipeline-etag' into 'master'Kamil Trzciński2017-05-241-0/+1
* Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'Douwe Maan2017-05-191-29/+0
|\
| * Fix 9.2 conflicts for 'Fix conflict resolution from corrupted upstream'9-2-stable-fix-conflicts-for-mr-11298Douwe Maan2017-05-191-32/+0
| * Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'Douwe Maan2017-05-191-0/+3
* | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-191-1/+9
* | Merge branch 'update_assignee_cache_counts_refactoring' into 'master' Sean McGivern2017-05-193-15/+5
|/
* Merge branch '31978-cross-reference-fix' into 'master' Sean McGivern2017-05-191-6/+7
* Merge branch 'dm-no-conflicts-when-branches-are-missing-9-2' into '9-2-stable'Regis Boudinot2017-05-191-0/+3
|\
| * Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing-9-2Douwe Maan2017-05-181-0/+3
* | Merge branch 'mk-fix-issue-1843' into 'master'Douwe Maan2017-05-182-2/+2
* | Gitaly reuse stubsAndrew Newdigate2017-05-181-2/+0
|/
* Merge branch 'mrchrisw-fix-slack-notify' into 'master' Sean McGivern2017-05-181-1/+1
* Snippet include EditableLuke "Jared" Bennett2017-05-171-0/+1
* Added editable concernLuke "Jared" Bennett2017-05-173-0/+9
* Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot2017-05-102-10/+5
* Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-101-13/+0
* Merge branch 'mr-widget-redesign-review' into 'master'Jacob Schatz2017-05-094-11/+35
* Merge branch 'sh-fix-almost-there-spec-mysql' into 'master' Sean McGivern2017-05-091-0/+9
* Merge branch 'fix/gl-project-id' into 'master'James Lopez2017-05-081-6/+0
|\
| * remove gl_project_id for I/E version updatefix/gl-project-idJames Lopez2017-05-021-6/+0
* | Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher2017-05-071-7/+8
|\ \
| * | Re-enable Gitaly commit_raw_diff featureAhmad Sherif2017-05-071-7/+8
* | | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-074-12/+18
|/ /
* | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ...Kamil Trzciński2017-05-062-10/+5
|\ \
| * \ Merge commit '3a2b60f7' from 'master'Grzegorz Bizon2017-05-0517-101/+234
| |\ \
| * \ \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-05-036-12/+44
| |\ \ \
| * \ \ \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-05-0239-120/+561
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-04-2218-114/+111
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-04-1361-923/+1510
| |\ \ \ \ \ \
| * | | | | | | Use build policy to determine if user can play buildGrzegorz Bizon2017-04-122-12/+0
| * | | | | | | Move code for playing an action to separate serviceGrzegorz Bizon2017-04-121-12/+3
| * | | | | | | Take branch access into account when stopping environmentGrzegorz Bizon2017-04-062-2/+8
| * | | | | | | Check branch access when user triggers manual actionGrzegorz Bizon2017-04-061-0/+10
* | | | | | | | Real time pipeline show actionZeger-Jan van de Weg2017-05-062-0/+48
* | | | | | | | Fix `Routable.find_by_full_path` on MySQLfix-routable-find-by-full-path-on-mysqlSean McGivern2017-05-061-1/+1
* | | | | | | | Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-064-17/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce risk of deadlocks17361-redirect-renamed-pathsMichael Kozono2017-05-051-7/+17
| * | | | | | | | Resolve discussionsMichael Kozono2017-05-051-1/+1
| * | | | | | | | Resolve discussionsMichael Kozono2017-05-051-0/+4
| * | | | | | | | Resolve discussionsMichael Kozono2017-05-052-12/+12
| * | | | | | | | RefactorMichael Kozono2017-05-051-4/+6
| * | | | | | | | Delete conflicting redirectsMichael Kozono2017-05-052-7/+16
| * | | | | | | | Create redirect routes on path changeMichael Kozono2017-05-051-7/+17
| * | | | | | | | Redirect from redirect routes to canonical routesMichael Kozono2017-05-053-4/+35
* | | | | | | | | Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'Sean McGivern2017-05-054-1/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix feature testsblackst0ne2017-05-041-0/+5
| * | | | | | | | | Add comment to notes aliasesblackst0ne2017-05-041-0/+2
| * | | | | | | | | Add alias_attributes for notesblackst0ne2017-05-041-0/+3
| * | | | | | | | | Add last_edited_at and last_edited_by attributesblackst0ne2017-05-042-0/+2
View Lorry Controller Status