summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rails-5-backports' into 'master' Robert Speicher2016-09-121-1/+1
|\
| * Fix two problematic bits of code that will be deprecated or broken in Rails 5.Connor Shea2016-09-051-1/+1
* | Merge branch '21092-file-execution-flag-is-not-preserved-when-editing-files' ...Rémy Coutable2016-09-121-1/+1
|\ \
| * | Simplify a condition in Repository#update_fileRémy Coutable2016-09-121-1/+1
| * | fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-filestiagonbotelho2016-09-091-1/+1
* | | Merge branch 'issue_21825' into 'master' Rémy Coutable2016-09-121-0/+11
|\ \ \
| * | | Add information about user and manual build start to runner as variablesSergey Gnuskov2016-09-091-0/+11
* | | | Merge branch '21814-fix' into 'master' Robert Speicher2016-09-101-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Pull import sources from Gitlab::ImportSourcesOjas Shirekar2016-09-091-1/+1
* | | | Enable pipeline events by defaultenable-pipeline-events-by-defaultLin Jen-Shin2016-09-091-0/+1
|/ / /
* | | Merge branch 'smart-pipeline-duration' into 'master' Rémy Coutable2016-09-081-1/+10
|\ \ \ | |/ / |/| |
| * | Show how long this pipeline was queuedLin Jen-Shin2016-09-051-0/+7
| * | Forget about pending duration for now, need more discussionLin Jen-Shin2016-09-051-2/+1
| * | Merge remote-tracking branch 'upstream/master' into smart-pipeline-durationLin Jen-Shin2016-09-0217-643/+219
| |\ \
| * | | Calculate real queueing time to exclude gaps from:Lin Jen-Shin2016-09-021-7/+2
| * | | no point to set duration while not started yetLin Jen-Shin2016-08-291-0/+2
| * | | Fix constant nameLin Jen-Shin2016-08-291-1/+1
| * | | Smartly calculate real running time and pending timeLin Jen-Shin2016-08-291-1/+7
* | | | Merge branch 'pipeline-hooks' into 'master' Rémy Coutable2016-09-083-26/+129
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-09-0623-671/+270
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-2610-107/+153
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-2451-299/+1093
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into pipeline-hooksLin Jen-Shin2016-08-0211-27/+139
| |\ \ \ \ \
| * | | | | | Slack pipeline events test and fix some issues along the wayLin Jen-Shin2016-08-012-12/+18
| * | | | | | Reduce complexity by extracting it to a methodLin Jen-Shin2016-07-301-17/+20
| * | | | | | Add pipeline_events to Slack service:Lin Jen-Shin2016-07-303-2/+99
| * | | | | | Fix that tricky side-effect issue in the testLin Jen-Shin2016-07-291-1/+1
| * | | | | | It was never usedLin Jen-Shin2016-07-291-2/+2
| * | | | | | Don't execute hooks if ci was supposed to be skippedLin Jen-Shin2016-07-291-2/+3
| * | | | | | Also touch the pipeline so we could just hook into update_stateLin Jen-Shin2016-07-291-6/+7
| * | | | | | We're not using original hash anyway, we could use itLin Jen-Shin2016-07-291-1/+1
| * | | | | | WIP, initial work to implement pipeline hooks:Lin Jen-Shin2016-07-294-0/+9
* | | | | | | Merge branch 'dz-mr-version-compare' into 'master' Douwe Maan2016-09-081-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Refactor merge request version compare featureDmitriy Zaporozhets2016-09-071-0/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '21109-discussion-resolve-runs-a-single-update-query-per-note-bu...Douwe Maan2016-09-082-12/+45
|\ \ \ \ \ \ \
| * | | | | | | Optimize discussion notes resolving and unresolving21109-discussion-resolve-runs-a-single-update-query-per-note-but-should-run-a-single-update-query-for-all-notes-insteadAlejandro Rodríguez2016-09-062-12/+45
| |/ / / / / /
* | | | | | | Merge branch 'ref-update-multiple-commits' into 'master' Douwe Maan2016-09-081-10/+14
|\ \ \ \ \ \ \
| * | | | | | | Rename {commit,update_branch}_with_hooksJacob Vosmaer2016-09-071-9/+9
| * | | | | | | Allow adding multiple commits in commit_with_hooksJacob Vosmaer2016-09-071-1/+5
| |/ / / / / /
* | | | | | | Change update interval of runners when trying to preserve contacted_atchange-update-interval-of-runnersKamil Trzcinski2016-09-071-1/+1
|/ / / / / /
* | | | | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-09-055-3/+7
|\ \ \ \ \ \
| * | | | | | Scope hooks thal will run for confidential issuesDouglas Barbosa Alexandre2016-08-312-0/+2
| * | | | | | Add option to confidential issues events to trigger servicesDouglas Barbosa Alexandre2016-08-313-3/+4
| * | | | | | Add option to confidential issues events to trigger WebhooksDouglas Barbosa Alexandre2016-08-311-0/+1
* | | | | | | Merge branch 'safe-ref-updates' into 'master' Douwe Maan2016-09-051-20/+21
|\ \ \ \ \ \ \
| * | | | | | | Make error message appropriate for end usersJacob Vosmaer2016-09-021-2/+2
| * | | | | | | Use 'git update-ref' for safer web commitsJacob Vosmaer2016-09-021-20/+21
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix/handle-raw-trace-error-on-old-builds' into 'master' Douwe Maan2016-09-021-5/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Refactor Ci::Build#raw_tracefix/handle-raw-trace-error-on-old-buildsTomasz Maczukin2016-09-011-5/+2
| * | | | | | Update specs - add mocks to simulate old versionsTomasz Maczukin2016-09-011-1/+9
View Lorry Controller Status