summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465acStan Hu2017-04-296-48/+30
* Merge branch '31595-emoji-btn' into 'master' Alfredo Sumaran2017-04-291-2/+2
|\
| * Fix emoji alignment31595-emoji-btnAnnabel Dunstone Gray2017-04-281-2/+2
* | Merge branch 'patch-21' into 'master' Stan Hu2017-04-291-1/+1
|\ \
| * | fix link to MR 10416Ben Bodenmiller2017-04-291-1/+1
|/ /
* | Merge branch 'rs-trigger-click' into 'master' Stan Hu2017-04-292-2/+2
|\ \
| * | Another change from .click -> .trigger('click') to make spec passStan Hu2017-04-281-1/+1
| * | Change from .click -> .trigger('click') to make spec passrs-trigger-clickRobert Speicher2017-04-281-1/+1
| |/
* | Merge branch 'docs/ldap-clarify-uid' into 'master' Marcia Ramos2017-04-281-3/+3
|\ \ | |/ |/|
| * Update ldap.md to clarify uid should list the attribute not the valuedocs/ldap-clarify-uidLee Matos2017-04-271-3/+3
* | Merge branch 'tc-no-todo-service-select' into 'master' Robert Speicher2017-04-286-30/+48
|\ \
| * | Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-selectToon Claes2017-04-276-30/+48
* | | Merge branch '31500-fix-rspec_profiling-reporting' into 'master' Robert Speicher2017-04-284-11/+10
|\ \ \
| * | | Resolve "rspec_profiling is enabled for MySQL"Rémy Coutable2017-04-284-11/+10
|/ / /
* | | Merge branch 'enable-spec-file-name-cop' into 'master' Robert Speicher2017-04-2836-591/+348
|\ \ \
| * | | Enable RSpec/FilePath copenable-spec-file-name-copSean McGivern2017-04-2636-591/+348
* | | | Merge branch 'dm-pull-preserve-into-render-helpers' into 'master' Sean McGivern2017-04-2818-39/+26
|\ \ \ \
| * | | | Pull preserve into render helpersDouwe Maan2017-04-2818-39/+26
* | | | | Merge branch 'grpc-1.2.5' into 'master' Robert Speicher2017-04-281-1/+1
|\ \ \ \ \
| * | | | | Use grpc 1.2.5Jacob Vosmaer2017-04-281-1/+1
* | | | | | Merge branch 'dm-video-viewer' into 'master' Sean McGivern2017-04-285-2/+24
|\ \ \ \ \ \
| * | | | | | Display video blobs in-line like imagesdm-video-viewerDouwe Maan2017-04-285-2/+24
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'dz-add-oauth-controller-spec' into 'master' Rémy Coutable2017-04-281-0/+55
|\ \ \ \ \ \
| * | | | | | Add tests for Oauth::AuthorizationsControllerdz-add-oauth-controller-specDmitriy Zaporozhets2017-04-281-0/+55
* | | | | | | Merge branch 'dz-improve-add-users-method' into 'master' Douwe Maan2017-04-282-2/+9
|\ \ \ \ \ \ \
| * | | | | | | Collect all users by single query when using Member#add_usersdz-improve-add-users-methodDmitriy Zaporozhets2017-04-282-2/+9
| |/ / / / / /
* | | | | | | Merge branch '28020-improve-todo-list-when-comes-from-yourself' into 'master' Sean McGivern2017-04-288-9/+157
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Improve text on todo list when the todo action comes from yourselfJacopo2017-04-288-9/+157
* | | | | | | Merge branch 'zj-accept-default-branch-param' into 'master' Douwe Maan2017-04-283-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Accept default branch param on notifaction servicesZeger-Jan van de Weg2017-04-283-1/+6
|/ / / / / / /
* | | | | | | Merge branch 'fix-sidebar-block-ref-test' into 'master' Sean McGivern2017-04-282-5/+4
|\ \ \ \ \ \ \
| * | | | | | | add issues and merge-requests classes and use to find in rspecfix-sidebar-block-ref-testLuke "Jared" Bennett2017-04-282-5/+4
* | | | | | | | Merge branch 'pages-0.4.1' into 'master' Kamil Trzciński2017-04-282-1/+5
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Use GitLab Pages v0.4.1Nick Thomas2017-04-252-1/+5
* | | | | | | | Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2Sean McGivern2017-04-285-1/+115
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove config lines in one placeJacob Vosmaer2017-04-281-3/+3
| * | | | | | | | Use rspec 'be'Jacob Vosmaer2017-04-281-1/+1
| * | | | | | | | Refactor timeout codeJacob Vosmaer2017-04-281-8/+17
| * | | | | | | | Add test that asserts unicorns terminateJacob Vosmaer2017-04-265-1/+106
* | | | | | | | | Merge branch 'docs/make-ci-run-only-for-doc-changes' into 'master' Achilleas Pipinellis2017-04-282-0/+51
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Document the process of docs only changesdocs/make-ci-run-only-for-doc-changesAchilleas Pipinellis2017-04-282-3/+28
| * | | | | | | | Skip irrelevant jobs for documentation only changesAchilleas Pipinellis2017-04-281-0/+26
* | | | | | | | | Merge branch '31549-check-duplicates-first' into 'master' Sean McGivern2017-04-282-0/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add notice at the beginning of issue templates asking reporters to check for ...Rémy Coutable2017-04-282-0/+31
| |/ / / / / / / /
* | | | | | | | | Merge branch '28457-slash-command-board-move' into 'master' Sean McGivern2017-04-286-9/+107
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add board_move slash commandAlex Sanford2017-04-286-9/+107
|/ / / / / / / / /
* | | | | | | | | Merge branch 'add_index_on_ci_runners_contacted_at' into 'master' Yorick Peterse2017-04-283-1/+25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add index on ci_runners.contacted_atblackst0ne2017-04-283-1/+25
* | | | | | | | | Merge branch 'improve-slack-docs' into 'master' Sean McGivern2017-04-284-66/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve Slack docsVictor Wu2017-04-284-66/+40
|/ / / / / / / / /