summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused initializerremove-unused-initializerSean McGivern2017-05-021-5/+0
| | | | We don't appear to have an `active_record_query_trace` dependency any more.
* Update CHANGELOG.md for 9.1.2Timothy Andrew2017-05-019-32/+11
| | | [ci skip]
* Merge branch 'rs-add_column_with_default_cops' into 'master' Sean McGivern2017-05-0116-13/+121
|\ | | | | | | | | | | | | Add cop to blacklist specific tables for `add_column_with_default` Closes #31293 See merge request !10892
| * Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrationsrs-add_column_with_default_copsRobert Speicher2017-04-2811-0/+11
| |
| * Add AddColumnWithDefaultToLargeTable copRobert Speicher2017-04-283-0/+96
| |
| * Rename AddColumnWithDefault to ReversibleAddColumnWithDefaultRobert Speicher2017-04-283-4/+4
| | | | | | | | | | We're going to add another cop that deals with another aspect of `add_column_with_default`, so we need to separate them.
| * Refactor the AddColumnWithDefault cop to use node matchersRobert Speicher2017-04-281-9/+10
| |
* | Merge branch 'patch-18' into 'master' Douwe Maan2017-04-301-1/+1
|\ \ | | | | | | | | | | | | Fix typo See merge request !11003
| * | Fix typoTsvi Mostovicz2017-04-301-1/+1
|/ /
* | Merge branch 'revert-c3c465ac' into 'master' Robert Speicher2017-04-296-48/+30
|\ \ | | | | | | | | | | | | Revert "Merge branch 'tc-no-todo-service-select' into 'master'" See merge request !10997
| * | Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465acStan Hu2017-04-296-48/+30
|/ / | | | | This reverts merge request !10845
* | Merge branch '31595-emoji-btn' into 'master' Alfredo Sumaran2017-04-291-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix emoji alignment Closes #31595 See merge request !10993
| * | 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 in health check docs See merge request !10996
| * | fix link to MR 10416Ben Bodenmiller2017-04-291-1/+1
|/ /
* | Merge branch 'rs-trigger-click' into 'master' Stan Hu2017-04-292-2/+2
|\ \ | | | | | | | | | | | | Change from .click -> .trigger('click') to make spec pass See merge request !10995
| * | 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 value See merge request !10956
| * Update ldap.md to clarify uid should list the attribute not the valuedocs/ldap-clarify-uidLee Matos2017-04-271-3/+3
| | | | | | | | [ci skip]
* | Merge branch 'tc-no-todo-service-select' into 'master' Robert Speicher2017-04-286-30/+48
|\ \ | | | | | | | | | | | | | | | | | | Avoid plucking Todo ids in TodoService Closes #30374 See merge request !10845
| * | Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-selectToon Claes2017-04-276-30/+48
| | | | | | | | | | | | | | | | | | | | | | | | TodoService should not call `.select(&:id)` on todos, because this is bad performance. So instead use sub-queries, which will result in a single SQL query to the database. https://docs.gitlab.com/ee/development/sql.html#plucking-ids
* | | Merge branch '31500-fix-rspec_profiling-reporting' into 'master' Robert Speicher2017-04-284-11/+10
|\ \ \ | | | | | | | | | | | | | | | | Resolve "rspec_profiling is enabled for MySQL" See merge request !10967
| * | | 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 cop Closes #31316 See merge request !10911
| * | | Enable RSpec/FilePath copenable-spec-file-name-copSean McGivern2017-04-2636-591/+348
| | | | | | | | | | | | | | | | | | | | | | | | - Ignore JS fixtures - Ignore qa directory - Rewrite concern specs to put concern name first
* | | | Merge branch 'dm-pull-preserve-into-render-helpers' into 'master' Sean McGivern2017-04-2818-39/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Pull preserve into render helpers See merge request !10986
| * | | | 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.5 Closes #31143 and gitaly#197 See merge request !10984
| * | | | | Use grpc 1.2.5Jacob Vosmaer2017-04-281-1/+1
| | | | | |
* | | | | | Merge branch 'dm-video-viewer' into 'master' Sean McGivern2017-04-285-2/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add video blob viewer See merge request !10749
| * | | | | | 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::AuthorizationsController See merge request !10982
| * | | | | | Add tests for Oauth::AuthorizationsControllerdz-add-oauth-controller-specDmitriy Zaporozhets2017-04-281-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | 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_users See merge request !10975
| * | | | | | | Collect all users by single query when using Member#add_usersdz-improve-add-users-methodDmitriy Zaporozhets2017-04-282-2/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | 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 yourself Closes #28020 See merge request !10594
| * | | | | | Improve text on todo list when the todo action comes from yourselfJacopo2017-04-288-9/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved todo message when an issue is assigned to yourself. - The new message when an user assign to himself an issue or a mr is: "You assigned issue xx to yourself" - The new message when an user adds a todo to himself is: "You added a todo for issue xx" - The new message when and user mention himself is: "You mentioned yourself on issue xx" - The new message when an user directly address himself is: "You directly addressed yourself on issue xx" - The new message when an user mark himself as an approver is: "You set yourself as an approver for merge request xx"
* | | | | | | Merge branch 'zj-accept-default-branch-param' into 'master' Douwe Maan2017-04-283-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept default branch param on notifaction services Closes #31173 See merge request !10959
| * | | | | | | 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 rspec See merge request !10980
| * | | | | | | 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.1 See merge request !10891
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unicorn worker termination tests See merge request !10818
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip irrelevant jobs for documentation only changes Closes #30853 See merge request !10961
View Lorry Controller Status