Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pipeline-hooks' into 'master' | Rémy Coutable | 2016-09-08 | 3 | -26/+129 |
|\ | |||||
| * | Merge remote-tracking branch 'upstream/master' into pipeline-hooks | Lin Jen-Shin | 2016-09-06 | 23 | -671/+270 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'upstream/master' into pipeline-hooks | Lin Jen-Shin | 2016-08-26 | 10 | -107/+153 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-hooks | Lin Jen-Shin | 2016-08-24 | 51 | -299/+1093 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into pipeline-hooks | Lin Jen-Shin | 2016-08-02 | 11 | -27/+139 |
| |\ \ \ \ | |||||
| * | | | | | Slack pipeline events test and fix some issues along the way | Lin Jen-Shin | 2016-08-01 | 2 | -12/+18 |
| * | | | | | Reduce complexity by extracting it to a method | Lin Jen-Shin | 2016-07-30 | 1 | -17/+20 |
| * | | | | | Add pipeline_events to Slack service: | Lin Jen-Shin | 2016-07-30 | 3 | -2/+99 |
| * | | | | | Fix that tricky side-effect issue in the test | Lin Jen-Shin | 2016-07-29 | 1 | -1/+1 |
| * | | | | | It was never used | Lin Jen-Shin | 2016-07-29 | 1 | -2/+2 |
| * | | | | | Don't execute hooks if ci was supposed to be skipped | Lin Jen-Shin | 2016-07-29 | 1 | -2/+3 |
| * | | | | | Also touch the pipeline so we could just hook into update_state | Lin Jen-Shin | 2016-07-29 | 1 | -6/+7 |
| * | | | | | We're not using original hash anyway, we could use it | Lin Jen-Shin | 2016-07-29 | 1 | -1/+1 |
| * | | | | | WIP, initial work to implement pipeline hooks: | Lin Jen-Shin | 2016-07-29 | 4 | -0/+9 |
* | | | | | | Merge branch 'dz-mr-version-compare' into 'master' | Douwe Maan | 2016-09-08 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor merge request version compare feature | Dmitriy Zaporozhets | 2016-09-07 | 1 | -0/+4 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch '21109-discussion-resolve-runs-a-single-update-query-per-note-bu... | Douwe Maan | 2016-09-08 | 2 | -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-instead | Alejandro Rodríguez | 2016-09-06 | 2 | -12/+45 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ref-update-multiple-commits' into 'master' | Douwe Maan | 2016-09-08 | 1 | -10/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rename {commit,update_branch}_with_hooks | Jacob Vosmaer | 2016-09-07 | 1 | -9/+9 |
| * | | | | | | Allow adding multiple commits in commit_with_hooks | Jacob Vosmaer | 2016-09-07 | 1 | -1/+5 |
| |/ / / / / | |||||
* | | | | | | Change update interval of runners when trying to preserve contacted_atchange-update-interval-of-runners | Kamil Trzcinski | 2016-09-07 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq | Rémy Coutable | 2016-09-05 | 5 | -3/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Scope hooks thal will run for confidential issues | Douglas Barbosa Alexandre | 2016-08-31 | 2 | -0/+2 |
| * | | | | | Add option to confidential issues events to trigger services | Douglas Barbosa Alexandre | 2016-08-31 | 3 | -3/+4 |
| * | | | | | Add option to confidential issues events to trigger Webhooks | Douglas Barbosa Alexandre | 2016-08-31 | 1 | -0/+1 |
* | | | | | | Merge branch 'safe-ref-updates' into 'master' | Douwe Maan | 2016-09-05 | 1 | -20/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make error message appropriate for end users | Jacob Vosmaer | 2016-09-02 | 1 | -2/+2 |
| * | | | | | | Use 'git update-ref' for safer web commits | Jacob Vosmaer | 2016-09-02 | 1 | -20/+21 |
* | | | | | | | Merge branch 'fix/handle-raw-trace-error-on-old-builds' into 'master' | Douwe Maan | 2016-09-02 | 1 | -5/+22 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Refactor Ci::Build#raw_tracefix/handle-raw-trace-error-on-old-builds | Tomasz Maczukin | 2016-09-01 | 1 | -5/+2 |
| * | | | | | | Update specs - add mocks to simulate old versions | Tomasz Maczukin | 2016-09-01 | 1 | -1/+9 |
| * | | | | | | Refactorize CI::Build model | Tomasz Maczukin | 2016-09-01 | 1 | -2/+10 |
| * | | | | | | Handle error on trace raw download with old builds (DB stored) | Tomasz Maczukin | 2016-09-01 | 1 | -0/+4 |
* | | | | | | | Merge branch 'sh-reload-find-branch' into 'master' | Yorick Peterse | 2016-09-01 | 1 | -2/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Optimize branch lookups and force a repository reload for Repository#find_branchsh-reload-find-branch | Stan Hu | 2016-09-01 | 1 | -2/+15 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'issue_19734' into 'master' | Douwe Maan | 2016-09-01 | 4 | -11/+118 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Project tools visibility level | Felipe Artur | 2016-09-01 | 4 | -11/+118 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'js-tooltips-for-mentions' into 'master' | Robert Speicher | 2016-09-01 | 2 | -16/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use JavaScript tooltips for mentions (!5301) | winniehell | 2016-09-01 | 2 | -16/+0 |
* | | | | | | | | Merge branch '20601-emoji-tooltip-in-chronological-order' into 'master' | Robert Speicher | 2016-09-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Order award tooltips by their created_at date | Andrew Smith | 2016-09-01 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'refactor/add-policies' into 'master' | Robert Speicher | 2016-08-31 | 4 | -583/+14 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | factor out a RuleSet so that `delegate!` retains @cannot | http://jneen.net/ | 2016-08-30 | 1 | -1/+1 |
| * | | | | | | remove the rest of the dead code | http://jneen.net/ | 2016-08-30 | 1 | -74/+0 |
| * | | | | | | take the dive - only use abilities from Policies | http://jneen.net/ | 2016-08-30 | 1 | -8/+1 |
| * | | | | | | port UserPolicy | http://jneen.net/ | 2016-08-30 | 1 | -11/+0 |
| * | | | | | | port runners, namespaces, group/project_members | http://jneen.net/ | 2016-08-30 | 1 | -58/+0 |
| * | | | | | | trim more dead code | http://jneen.net/ | 2016-08-30 | 1 | -52/+1 |
| * | | | | | | port groups | http://jneen.net/ | 2016-08-30 | 1 | -36/+3 |