summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-copRémy Coutable2017-06-0225-51/+53
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '2361-pending-migrations-break-current-settings' into 'master'Rémy Coutable2017-06-023-4/+5
|\ | | | | | | | | | | | | Skip loading application settings from the database when migrations are pending Closes gitlab-ee#2361 See merge request !11842
| * Skip loading application settings from the database when migrations are pendingNick Thomas2017-06-023-4/+5
| | | | | | | | | | | | Various Rails initializers (metrics, sentry, etc) are run before migrations, which can lead to a mismatch between app/models/application_settings.rb and schema.
* | Merge branch 'winh-styled-people-search-bar' into 'master'Tim Zallmann2017-06-0212-143/+414
|\ \ | | | | | | | | | | | | | | | | | | Style people in issuable search bar Closes #30468 See merge request !11402
| * | Style people in issuable search bar (!11402)winh-styled-people-search-barwinh2017-06-0210-22/+237
| | |
| * | Move clear search button out of issuable search barwinh2017-06-022-3/+3
| | |
| * | Add frontend fixture for issue listwinh2017-06-021-0/+11
| | |
| * | Simplify filtered_search_visual_tokens_spec.jswinh2017-06-021-118/+163
| | |
* | | Merge branch 'job-details-increase-deboune' into 'master'33126-vue-js-timeago-add-missing-functionalitiesPhil Hughes2017-06-022-4/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use throttle when window is resized Closes #33222 See merge request !11857
| * | | Use throttle when window is resizedFilipa Lacerda2017-06-022-4/+2
|/ / /
* | | Merge branch 'port-refactor-wiki-page-services' into 'master'Grzegorz Bizon2017-06-023-48/+53
|\ \ \ | | | | | | | | | | | | | | | | Refactor specs for WikiPage services See merge request !11862
| * | | Refactor specs for WikiPage servicesport-refactor-wiki-page-servicesDouglas Barbosa Alexandre2017-06-023-48/+53
| | |/ | |/|
* | | Merge branch ↵Rémy Coutable2017-06-023-8/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file' into 'master' Resolve "Merge conflict resolution removed the newline in the end of file" Closes #32983 See merge request !11817
| * | | Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-fileSean McGivern2017-06-013-8/+50
| | | | | | | | | | | | | | | | | | | | If our side of the conflict file has a trailing newline, and we are picking sections, not editing the whole content, then add a trailing newline back.
* | | | Merge branch '32747-translation-of-dates-for-cycle-analytics-is-incomplete' ↵James Lopez2017-06-023-1/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add translations for elapsed time in words Closes #32747 See merge request !11769
| * | | | Add translations for elapsed time in words32747-translation-of-dates-for-cycle-analytics-is-incompleteRuben Davila2017-06-023-1/+72
| | | | |
* | | | | Merge branch '33242-create-project-for-user-api-ignores-path-parameter' into ↵Sean McGivern2017-06-023-5/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add optional path parameter and fix tests Closes #33242 See merge request !11868
| * | | | | Fix missing optional path parameter in "Create project for user" API33242-create-project-for-user-api-ignores-path-parameterAthar Hameed2017-06-023-5/+26
| | | | | |
* | | | | | Merge branch '28080-system-checks' into 'master'Sean McGivern2017-06-0231-479/+1197
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | SystemCheck library for executing checks from a rake task See merge request !9173
| * | | | | | Refactor and move things around to improve in YAGNI perspectiveGabriel Mazetto2017-05-316-102/+91
| | | | | | |
| * | | | | | Fix BasicExecutor specsGabriel Mazetto2017-05-313-31/+11
| | | | | | |
| * | | | | | ChangelogGabriel Mazetto2017-05-311-0/+4
| | | | | | |
| * | | | | | Fixed and improved some existing checks and SystemCheck libraryGabriel Mazetto2017-05-3112-77/+61
| | | | | | |
| * | | | | | Fix codestyleGabriel Mazetto2017-05-314-12/+8
| | | | | | |
| * | | | | | Improve Specs and some fixesGabriel Mazetto2017-05-316-8/+198
| | | | | | |
| * | | | | | Add ActiveUsers CheckGabriel Mazetto2017-05-312-6/+19
| | | | | | |
| * | | | | | Refactor gitlab:app:checks to use SystemCheckGabriel Mazetto2017-05-3122-504/+778
| | | | | | |
| * | | | | | Added specs for BaseExecutorGabriel Mazetto2017-05-311-0/+51
| | | | | | |
| * | | | | | Added specs for SystemCheck and custom matcherGabriel Mazetto2017-05-313-0/+65
| | | | | | |
| * | | | | | Fix a few method signature checksGabriel Mazetto2017-05-312-2/+2
| | | | | | |
| * | | | | | Move rainbow monkey patch to String to spec_helperGabriel Mazetto2017-05-312-1/+3
| | | | | | |
| * | | | | | Some code-style fixes and documentationGabriel Mazetto2017-05-314-17/+76
| | | | | | |
| * | | | | | WIP SystemCheck library for executing checks from a rake taskGabriel Mazetto2017-05-315-0/+111
| | | | | | |
* | | | | | | Merge branch '33215-fix-hard-delete-of-users' into 'master'Douwe Maan2017-06-024-7/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hard-deleting users when they have authored issues Closes #33215 See merge request !11855
| * | | | | | | Fix hard-deleting users when they have authored issuesNick Thomas2017-06-024-7/+13
| | | | | | | |
* | | | | | | | Merge branch 'update-installation-docs-with-i18n' into 'master'Douwe Maan2017-06-021-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add section to compile GetText files for source installations See merge request !11865
| * | | | | | | | Add section to compile GetText files for source installationsupdate-installation-docs-with-i18nRuben Davila2017-06-011-0/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'blameless' into 'master'Rémy Coutable2017-06-027-5/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Promote blameless culture by using "annotate" instead See merge request !10378
| * | | | | | | | Promote blameless culture by using "annotate" insteadIlya Vassilevsky2017-06-027-5/+10
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | User-facing changes (fast & easy win)
* | | | | | | | Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-0244-230/+726
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599
| * | | | | | | | Minor refactor based on review feedbackkushalpandya2017-06-022-2/+3
| | | | | | | | |
| * | | | | | | | Address review comments31511-jira-settingsJarka Kadlecova2017-06-024-6/+6
| | | | | | | | |
| * | | | | | | | Action link role sets to `button` if no HREF is givenkushalpandya2017-06-011-2/+8
| | | | | | | | |
| * | | | | | | | Update as per reviewkushalpandya2017-06-012-2/+1
| | | | | | | | |
| * | | | | | | | Update tests based on source changeskushalpandya2017-06-011-7/+10
| | | | | | | | |
| * | | | | | | | Provide `test-url` via backendkushalpandya2017-06-011-1/+1
| | | | | | | | |
| * | | | | | | | Remove extra new linekushalpandya2017-06-011-1/+0
| | | | | | | | |
| * | | | | | | | Update as per review feedbackkushalpandya2017-06-012-27/+32
| | | | | | | | |
| * | | | | | | | Add doc commentkushalpandya2017-06-011-2/+15
| | | | | | | | |
| * | | | | | | | Address MR commentsJarka Kadlecova2017-06-016-4/+25
| | | | | | | | |
View Lorry Controller Status