Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465ac | Stan Hu | 2017-04-29 | 6 | -48/+30 |
* | Merge branch '31595-emoji-btn' into 'master' | Alfredo Sumaran | 2017-04-29 | 1 | -2/+2 |
|\ | |||||
| * | Fix emoji alignment31595-emoji-btn | Annabel Dunstone Gray | 2017-04-28 | 1 | -2/+2 |
* | | Merge branch 'patch-21' into 'master' | Stan Hu | 2017-04-29 | 1 | -1/+1 |
|\ \ | |||||
| * | | fix link to MR 10416 | Ben Bodenmiller | 2017-04-29 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'rs-trigger-click' into 'master' | Stan Hu | 2017-04-29 | 2 | -2/+2 |
|\ \ | |||||
| * | | Another change from .click -> .trigger('click') to make spec pass | Stan Hu | 2017-04-28 | 1 | -1/+1 |
| * | | Change from .click -> .trigger('click') to make spec passrs-trigger-click | Robert Speicher | 2017-04-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'docs/ldap-clarify-uid' into 'master' | Marcia Ramos | 2017-04-28 | 1 | -3/+3 |
|\ \ | |/ |/| | |||||
| * | Update ldap.md to clarify uid should list the attribute not the valuedocs/ldap-clarify-uid | Lee Matos | 2017-04-27 | 1 | -3/+3 |
* | | Merge branch 'tc-no-todo-service-select' into 'master' | Robert Speicher | 2017-04-28 | 6 | -30/+48 |
|\ \ | |||||
| * | | Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-select | Toon Claes | 2017-04-27 | 6 | -30/+48 |
* | | | Merge branch '31500-fix-rspec_profiling-reporting' into 'master' | Robert Speicher | 2017-04-28 | 4 | -11/+10 |
|\ \ \ | |||||
| * | | | Resolve "rspec_profiling is enabled for MySQL" | Rémy Coutable | 2017-04-28 | 4 | -11/+10 |
|/ / / | |||||
* | | | Merge branch 'enable-spec-file-name-cop' into 'master' | Robert Speicher | 2017-04-28 | 36 | -591/+348 |
|\ \ \ | |||||
| * | | | Enable RSpec/FilePath copenable-spec-file-name-cop | Sean McGivern | 2017-04-26 | 36 | -591/+348 |
* | | | | Merge branch 'dm-pull-preserve-into-render-helpers' into 'master' | Sean McGivern | 2017-04-28 | 18 | -39/+26 |
|\ \ \ \ | |||||
| * | | | | Pull preserve into render helpers | Douwe Maan | 2017-04-28 | 18 | -39/+26 |
* | | | | | Merge branch 'grpc-1.2.5' into 'master' | Robert Speicher | 2017-04-28 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Use grpc 1.2.5 | Jacob Vosmaer | 2017-04-28 | 1 | -1/+1 |
* | | | | | | Merge branch 'dm-video-viewer' into 'master' | Sean McGivern | 2017-04-28 | 5 | -2/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Display video blobs in-line like imagesdm-video-viewer | Douwe Maan | 2017-04-28 | 5 | -2/+24 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'dz-add-oauth-controller-spec' into 'master' | Rémy Coutable | 2017-04-28 | 1 | -0/+55 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add tests for Oauth::AuthorizationsControllerdz-add-oauth-controller-spec | Dmitriy Zaporozhets | 2017-04-28 | 1 | -0/+55 |
* | | | | | | | Merge branch 'dz-improve-add-users-method' into 'master' | Douwe Maan | 2017-04-28 | 2 | -2/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Collect all users by single query when using Member#add_usersdz-improve-add-users-method | Dmitriy Zaporozhets | 2017-04-28 | 2 | -2/+9 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch '28020-improve-todo-list-when-comes-from-yourself' into 'master' | Sean McGivern | 2017-04-28 | 8 | -9/+157 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Improve text on todo list when the todo action comes from yourself | Jacopo | 2017-04-28 | 8 | -9/+157 |
* | | | | | | | Merge branch 'zj-accept-default-branch-param' into 'master' | Douwe Maan | 2017-04-28 | 3 | -1/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Accept default branch param on notifaction services | Zeger-Jan van de Weg | 2017-04-28 | 3 | -1/+6 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'fix-sidebar-block-ref-test' into 'master' | Sean McGivern | 2017-04-28 | 2 | -5/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add issues and merge-requests classes and use to find in rspecfix-sidebar-block-ref-test | Luke "Jared" Bennett | 2017-04-28 | 2 | -5/+4 |
* | | | | | | | | Merge branch 'pages-0.4.1' into 'master' | Kamil Trzciński | 2017-04-28 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Use GitLab Pages v0.4.1 | Nick Thomas | 2017-04-25 | 2 | -1/+5 |
* | | | | | | | | Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2 | Sean McGivern | 2017-04-28 | 5 | -1/+115 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove config lines in one place | Jacob Vosmaer | 2017-04-28 | 1 | -3/+3 |
| * | | | | | | | | Use rspec 'be' | Jacob Vosmaer | 2017-04-28 | 1 | -1/+1 |
| * | | | | | | | | Refactor timeout code | Jacob Vosmaer | 2017-04-28 | 1 | -8/+17 |
| * | | | | | | | | Add test that asserts unicorns terminate | Jacob Vosmaer | 2017-04-26 | 5 | -1/+106 |
* | | | | | | | | | Merge branch 'docs/make-ci-run-only-for-doc-changes' into 'master' | Achilleas Pipinellis | 2017-04-28 | 2 | -0/+51 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Document the process of docs only changesdocs/make-ci-run-only-for-doc-changes | Achilleas Pipinellis | 2017-04-28 | 2 | -3/+28 |
| * | | | | | | | | Skip irrelevant jobs for documentation only changes | Achilleas Pipinellis | 2017-04-28 | 1 | -0/+26 |
* | | | | | | | | | Merge branch '31549-check-duplicates-first' into 'master' | Sean McGivern | 2017-04-28 | 2 | -0/+31 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add notice at the beginning of issue templates asking reporters to check for ... | Rémy Coutable | 2017-04-28 | 2 | -0/+31 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch '28457-slash-command-board-move' into 'master' | Sean McGivern | 2017-04-28 | 6 | -9/+107 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add board_move slash command | Alex Sanford | 2017-04-28 | 6 | -9/+107 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'add_index_on_ci_runners_contacted_at' into 'master' | Yorick Peterse | 2017-04-28 | 3 | -1/+25 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add index on ci_runners.contacted_at | blackst0ne | 2017-04-28 | 3 | -1/+25 |
* | | | | | | | | | Merge branch 'improve-slack-docs' into 'master' | Sean McGivern | 2017-04-28 | 4 | -66/+40 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Improve Slack docs | Victor Wu | 2017-04-28 | 4 | -66/+40 |
|/ / / / / / / / / |