Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'feature-ci-only-except-trigger' into 'master' | Kamil Trzciński | 2016-03-22 | 4 | -10/+66 |
|\ | |||||
| * | make conditional a bit clearer | Jason Roehm | 2016-03-15 | 1 | -1/+1 |
| * | fixed missing argument in list | Jason Roehm | 2016-03-15 | 1 | -1/+1 |
| * | fix rubocop violation | Jason Roehm | 2016-03-15 | 1 | -1/+1 |
| * | add some documentation for `triggers` keyword [ci skip] | Jason Roehm | 2016-03-15 | 1 | -1/+12 |
| * | add tests for only/except 'triggers' keyword | Jason Roehm | 2016-03-15 | 1 | -0/+44 |
| * | add 'triggers' keyword to gitlab-ci.yml 'only' and 'except' fields to allow c... | Jason Roehm | 2016-03-15 | 2 | -8/+9 |
* | | Merge branch 'issue_12658' into 'master' | Robert Speicher | 2016-03-22 | 1 | -1/+3 |
|\ \ | |||||
| * | | Check if index exists before adding it. [ci skip] | Rubén Dávila | 2016-03-21 | 1 | -1/+3 |
|/ / | |||||
* | | Merge branch 'issue_12658' into 'master' | Robert Speicher | 2016-03-22 | 101 | -977/+1538 |
|\ \ | |||||
| * | | Fix specsissue_12658 | Douwe Maan | 2016-03-22 | 3 | -11/+13 |
| * | | Address feedback | Douwe Maan | 2016-03-22 | 24 | -100/+154 |
| * | | Merge branch 'master' into issue_12658 | Douwe Maan | 2016-03-21 | 159 | -761/+2015 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master' | Jacob Schatz | 2016-03-21 | 34 | -47/+47 |
|\ \ \ | |||||
| * | | | change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltip | Arinde Eniola | 2016-03-20 | 34 | -47/+47 |
* | | | | Merge branch 'css-indentation' into 'master' | Jacob Schatz | 2016-03-21 | 3 | -9/+9 |
|\ \ \ \ | |||||
| * | | | | Fix Indentation lints in CSS. | connorshea | 2016-03-18 | 3 | -9/+9 |
* | | | | | Merge branch 'ssh-page-ago' into 'master' | Jacob Schatz | 2016-03-21 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove duplicated agossh-page-ago | Robert Schilling | 2016-03-21 | 1 | -1/+1 |
* | | | | | | Merge branch 'project-icon' into 'master' | Jacob Schatz | 2016-03-21 | 3 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Updated other views with new project iconproject-icon | Phil Hughes | 2016-03-21 | 2 | -2/+2 |
| * | | | | | | Group page now uses correct project icon | Phil Hughes | 2016-03-21 | 1 | -1/+1 |
* | | | | | | | Merge branch 'css-shorthand' into 'master' | Jacob Schatz | 2016-03-21 | 10 | -23/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Follow the CSS Style Guide rules for using shorthand where possible. | connorshea | 2016-03-18 | 10 | -23/+23 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '2489-soft-delete-issues' into 'master' | Douwe Maan | 2016-03-21 | 25 | -38/+231 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into 2489-soft-delete-issues | Zeger-Jan van de Weg | 2016-03-21 | 100 | -647/+1708 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Fix typos and denting | Zeger-Jan van de Weg | 2016-03-21 | 4 | -12/+11 |
| * | | | | | | | Minor improvements on IssuableActions | Zeger-Jan van de Weg | 2016-03-21 | 17 | -165/+110 |
| * | | | | | | | Satisfy rubocop | Zeger-Jan van de Weg | 2016-03-19 | 2 | -4/+1 |
| * | | | | | | | minor improvements and fixed specs | Zeger-Jan van de Weg | 2016-03-19 | 6 | -29/+34 |
| * | | | | | | | Dry destroy action on issuables | Zeger-Jan van de Weg | 2016-03-19 | 15 | -43/+56 |
| * | | | | | | | Hide delete botton on edit page | Zeger-Jan van de Weg | 2016-03-19 | 6 | -11/+9 |
| * | | | | | | | Soft delete issuables | Zeger-Jan van de Weg | 2016-03-19 | 20 | -18/+254 |
* | | | | | | | | Merge branch 'fix/safe-import-url' into 'master' | Douwe Maan | 2016-03-21 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | updated changelogfix/safe-import-url | James Lopez | 2016-03-21 | 1 | -0/+1 |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/safe-import... | James Lopez | 2016-03-21 | 658 | -8791/+13482 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'remove-console-log' into 'master' | Jacob Schatz | 2016-03-21 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove console.log call | Stan Hu | 2016-03-20 | 1 | -1/+0 |
* | | | | | | | | | Merge branch 'issues-show-performance' into 'master' | Robert Speicher | 2016-03-21 | 13 | -23/+140 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Create SSH keys for SSH clone Spinach testsissues-show-performance | Yorick Peterse | 2016-03-21 | 2 | -0/+2 |
| * | | | | | | | | | Create repositories in Spinach issues tests | Yorick Peterse | 2016-03-19 | 1 | -1/+1 |
| * | | | | | | | | | Create repositories in IssuesController specs | Yorick Peterse | 2016-03-19 | 1 | -2/+2 |
| * | | | | | | | | | Cache output of Repository#exists? | Yorick Peterse | 2016-03-19 | 8 | -15/+130 |
| * | | | | | | | | | Tweaked performance of Issue#related_branches | Yorick Peterse | 2016-03-19 | 2 | -5/+5 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'feature/issue-move' into 'master' | Kamil Trzciński | 2016-03-21 | 30 | -15/+866 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Do not rewrite reference if already a cross reference | Grzegorz Bizon | 2016-03-21 | 1 | -2/+4 |
| * | | | | | | | | | Change icon and cursor for issue move field tooltipfeature/issue-move | Grzegorz Bizon | 2016-03-20 | 1 | -2/+2 |
| * | | | | | | | | | Preserve created at time of notes when moving issue | Grzegorz Bizon | 2016-03-20 | 2 | -1/+7 |
| * | | | | | | | | | Merge branch 'master' into feature/issue-move | Grzegorz Bizon | 2016-03-20 | 23 | -57/+158 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Find referable for each ref found in references rewriter | Grzegorz Bizon | 2016-03-20 | 2 | -10/+19 |