summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timingsYorick Peterse2017-06-193-2/+6
* Merge branch 'mk-add-project-moved-errors-for-git' into 'master'Douwe Maan2017-06-1912-68/+265
|\
| * Add specific test caseMichael Kozono2017-06-161-0/+20
| * Add “Project moved” error to Git-over-HTTPMichael Kozono2017-06-163-40/+37
| * Add “Project moved” error to Git-over-SSHMichael Kozono2017-06-169-28/+208
* | Merge branch '27697-make-arrow-icons-consistent-in-dropdown' into 'master'adam-is-testing-mr-templatesAnnabel Dunstone Gray2017-06-198-26/+57
|\ \
| * | [#27697] Make the arrow icons consistent in dropdownTM Lee2017-06-198-26/+57
|/ /
* | Merge branch 'add-since-and-until-params-to-issuables' into 'master'Rémy Coutable2017-06-198-3/+87
|\ \
| * | add since and until params to issuablesKyle Bishop2017-06-188-3/+87
* | | Merge branch '33461-display-user-id' into 'master'Grzegorz Bizon2017-06-193-4/+34
|\ \ \
| * | | Update test to use single quotes and Four-Phase test conventionsRiccardo Padovani2017-06-151-2/+3
| * | | #33641: add spec for profile pageRiccardo Padovani2017-06-151-0/+18
| * | | 33641: Add changelogRiccardo Padovani2017-06-131-0/+4
| * | | #33461: Display own user id in account settings pageRiccardo Padovani2017-06-131-4/+11
| |/ /
* | | Merge branch '33824-update-mr-prometheus-docs' into 'master'Achilleas Pipinellis2017-06-192-4/+4
|\ \ \
| * | | Update Prometheus Merge Request Metrics pageJoshua Lambert2017-06-192-4/+4
|/ / /
* | | Merge branch '26212-upload-user-avatar-trough-api' into 'master'Rémy Coutable2017-06-194-0/+17
|\ \ \
| * | | Accept image for avatar in user APIvanadium232017-06-164-0/+17
* | | | 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
|\ \ \ \ \ \