summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* use proper `if defined?` check.33823_do_not_enable_defaults_when_metrics_folder_is_missingPawel Chojnacki2017-06-201-2/+5
* Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-194-2/+49
* Merge branch 'issue_33205' into 'master'Sean McGivern2017-06-193-4/+28
|\
| * Fix API bug accepting wrong merge requests parametersissue_33205Felipe Artur2017-06-163-4/+28
* | Merge branch 'consistent-filtered-search-boards' into 'master'Phil Hughes2017-06-191-1/+0
|\ \
| * | Make filtered search boards more consistent with EEconsistent-filtered-search-boardsClement Ho2017-06-161-1/+0
* | | Merge branch 'consistent-dropdown-hint' into 'master'Phil Hughes2017-06-191-1/+1
|\ \ \
| * | | Make dropdown hint consistent with EE versionconsistent-dropdown-hintClement Ho2017-06-161-1/+1
| |/ /
* | | Merge branch 'fix-atom-eslint' into 'master'Tim Zallmann2017-06-181-16/+7
|\ \ \
| * | | refactor zopfli fallback configfix-atom-eslintMike Greiling2017-06-161-15/+6
| * | | don't make assumptions about command line arguments invoking webpack configMike Greiling2017-06-161-1/+1
* | | | Merge branch 'mr-widget-memory-usage-tech-debt-fix' into 'master'Phil Hughes2017-06-172-2/+6
|\ \ \ \
| * | | | Changed utilites imports from ~ to relative pathsJose Ivan Vargas2017-06-162-2/+6
* | | | | Merge branch 'rs-revert-11842' into 'master'Stan Hu2017-06-161-2/+1
|\ \ \ \ \
| * | | | | Partially revert 1e8dbd46Robert Speicher2017-06-161-2/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'remove_unnecessary_spec_file' into 'master'Robert Speicher2017-06-161-102/+0
|\ \ \ \ \
| * | | | | Remove unnecessary spec fileFelipe Artur2017-06-161-102/+0
* | | | | | Merge branch 'increase-karma-socket-timeout' into 'master'Clement Ho2017-06-163-36/+49
|\ \ \ \ \ \
| * | | | | | Increase karma socket timeoutMike Greiling2017-06-163-36/+49
|/ / / / / /
* | | | | | Merge branch 'boards-spec-fix' into 'master'Robert Speicher2017-06-161-4/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fixes boards_spec failureboards-spec-fixPhil Hughes2017-06-161-4/+4
* | | | | | Merge branch 'fix-overflow-slash-commands' into 'master'Annabel Dunstone Gray2017-06-162-0/+15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fixed overflow on mobile screens for the slash commandsJose Ivan Vargas Lopez2017-06-162-0/+15
|/ / / / /
* | | | | Merge branch 'backport-panels-styles-from-ee' into 'master'Annabel Dunstone Gray2017-06-161-42/+48
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Backport panels styles from EEbackport-panels-styles-from-eeEric Eastwood2017-06-151-42/+48
* | | | | Merge branch 'merge-request-diffs-table' into 'master'Douwe Maan2017-06-1624-52/+271
|\ \ \ \ \
| * | | | | Add table for files in merge request diffsSean McGivern2017-06-1624-52/+271
| | |_|/ / | |/| | |
* | | | | Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-165-32/+127
|\ \ \ \ \
| * | | | | Make the GroupFinder specs more strictToon Claes2017-06-152-21/+47
| * | | | | Better exception message and some additional code commentToon Claes2017-06-151-1/+3
| * | | | | Subgroups page should show groups authorized through inheritanceToon Claes2017-06-155-26/+93
| | |/ / / | |/| | |
* | | | | Merge branch '33779-reset-session-before-blocking-requests' into 'master'Robert Speicher2017-06-162-6/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Call Capybara.reset_sessions! before block_and_wait_for_requests_complete33779-reset-session-before-blocking-requestsRémy Coutable2017-06-162-6/+9
* | | | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-1691-292/+299
|\ \ \ \ \
| * | | | | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-1591-292/+299
| | |/ / / | |/| | |
* | | | | Merge branch 'issue_20900' into 'master'Sean McGivern2017-06-1621-347/+182
|\ \ \ \ \
| * | | | | Improve method names and add more specsFelipe Artur2017-06-1611-35/+63
| * | | | | Migration - Remove position field from issues and merge requestsFelipe Artur2017-06-164-3/+15
| * | | | | Remove old specs and add new onesFelipe Artur2017-06-167-39/+44
| * | | | | Order merge requests by priorityFelipe Artur2017-06-168-156/+10
| * | | | | Order issues by priorityFelipe Artur2017-06-167-16/+18
| * | | | | Remove Drag and drop and sorting from milestone viewFelipe Artur2017-06-169-153/+87
| | |/ / / | |/| | |
* | | | | Merge branch '33739-blame-legend-bottom-border' into 'master'Annabel Dunstone Gray2017-06-161-0/+1
|\ \ \ \ \
| * | | | | Add missing bottom border to blame age legendJeff Stubler2017-06-151-0/+1
* | | | | | Merge branch 'bvl-missing-translations' into 'master'Douwe Maan2017-06-1627-98/+1981
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Small refactoring plus fixes for Spanish translations.Ruben Davila2017-06-156-25/+18
| * | | | | Add translation for the verb 'Revert'Bob Van Landuyt2017-06-154-4/+13
| * | | | | Take timezone into account when comparing dates in the UIBob Van Landuyt2017-06-152-2/+2
| * | | | | Regenerate po-filesBob Van Landuyt2017-06-152-2/+2
| * | | | | Add context to the `with_stage` stringsBob Van Landuyt2017-06-154-19/+22
View Lorry Controller Status