summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | Refactorize CI::Build modelTomasz Maczukin2016-09-011-2/+10
| * | | | | | Handle error on trace raw download with old builds (DB stored)Tomasz Maczukin2016-09-011-0/+4
* | | | | | | Merge branch 'sh-reload-find-branch' into 'master' Yorick Peterse2016-09-011-2/+15
|\ \ \ \ \ \ \
| * | | | | | | Optimize branch lookups and force a repository reload for Repository#find_branchsh-reload-find-branchStan Hu2016-09-011-2/+15
| |/ / / / / /
* | | | | | | Merge branch 'issue_19734' into 'master' Douwe Maan2016-09-014-11/+118
|\ \ \ \ \ \ \
| * | | | | | | Project tools visibility levelFelipe Artur2016-09-014-11/+118
| |/ / / / / /
* | | | | | | Merge branch 'js-tooltips-for-mentions' into 'master' Robert Speicher2016-09-012-16/+0
|\ \ \ \ \ \ \
| * | | | | | | Use JavaScript tooltips for mentions (!5301)winniehell2016-09-012-16/+0
* | | | | | | | Merge branch '20601-emoji-tooltip-in-chronological-order' into 'master' Robert Speicher2016-09-011-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Order award tooltips by their created_at dateAndrew Smith2016-09-011-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'refactor/add-policies' into 'master' Robert Speicher2016-08-314-583/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | factor out a RuleSet so that `delegate!` retains @cannothttp://jneen.net/2016-08-301-1/+1
| * | | | | | remove the rest of the dead codehttp://jneen.net/2016-08-301-74/+0
| * | | | | | take the dive - only use abilities from Policieshttp://jneen.net/2016-08-301-8/+1
| * | | | | | port UserPolicyhttp://jneen.net/2016-08-301-11/+0
| * | | | | | port runners, namespaces, group/project_membershttp://jneen.net/2016-08-301-58/+0
| * | | | | | trim more dead codehttp://jneen.net/2016-08-301-52/+1
| * | | | | | port groupshttp://jneen.net/2016-08-301-36/+3