summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Load tree readme asynchronouslydm-async-tree-readmeDouwe Maan2017-05-103-5/+15
* Merge branch 'deltas-only' into 'master' Sean McGivern2017-05-091-1/+3
|\
| * Use Rails 'delegate'Jacob Vosmaer2017-05-091-3/+1
| * Don't make Commit#raw_deltas privateJacob Vosmaer2017-05-091-4/+4
| * Don't use DiffCollection for deltasJacob Vosmaer2017-05-091-1/+5
* | Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-092-14/+6
|\ \
| * | Fix specs 2Felipe Artur2017-05-081-8/+3
| * | Add merge requests association to pipelineFelipe Artur2017-05-081-0/+1
| * | Preloads head pipeline for each merge requestFelipe Artur2017-05-081-6/+2
* | | Merge branch 'tc-cache-trackable-attributes' into 'master' Douwe Maan2017-05-091-0/+11
|\ \ \
| * | | Devise can assign trackable fields, but only allow writes once/hourtc-cache-trackable-attributesToon Claes2017-05-081-4/+5
| * | | Limit `update_tracked_fields` to write to database once/hourToon Claes2017-05-081-0/+10
* | | | Fallback to default pattern when note does not belong to projecttc-fix-snippets-notes-specToon Claes2017-05-091-1/+1
* | | | Merge branch 'mrchrisw-fix-slack-notify' into 'master' Sean McGivern2017-05-091-1/+1
|\ \ \ \
| * | | | Fix notify_only_default_branch check for Slack servicemrchrisw-fix-slack-notifyChris Wilson2017-05-081-1/+1
| |/ / /
* | | | Merge request widget redesignFatih Acet2017-05-094-11/+35
| |/ / |/| |
* | | Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' into...31977-ensure-all-webpack-bundles-which-include-vue-are-children-of-common_vue-jsDmitriy Zaporozhets2017-05-082-0/+38
|\ \ \
| * | | Use regex to skip unnecessary reference processing in ProcessCommitWorkerJames Edwards-Jones2017-05-042-0/+38
* | | | Merge branch 'sh-fix-almost-there-spec-mysql' into 'master' Sean McGivern2017-05-081-0/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix sub-second timing comparison error for Devise confirmation periodsh-fix-almost-there-spec-mysqlStan Hu2017-05-071-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