summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add printing_merge_request_link_enabled to APIDavid Turner2017-06-194-0/+10
* 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
| * | | | Add context for commit_box titleBob Van Landuyt2017-06-154-18/+27
| * | | | Remove HTML from translation keyBob Van Landuyt2017-06-153-20/+22
| * | | | Don't translate `Commit#change_type_title` nowBob Van Landuyt2017-06-151-3/+2
| * | | | `merge request` instead of `merge-request`Bob Van Landuyt2017-06-151-2/+2
| * | | | Add some context to JS translationsBob Van Landuyt2017-06-154-18/+17
| * | | | Small update for Spanish translationRuben Davila2017-06-152-3/+3
| * | | | More updates for Spanish translationsRuben Davila2017-06-152-10/+10
| * | | | Update timeago tooltips for SpanishBob Van Landuyt2017-06-151-0/+1
| * | | | Update Spanish translations after code reviewRuben Davila2017-06-157-27/+161
| * | | | Use the same time format as beforeBob Van Landuyt2017-06-152-1/+2
| * | | | Re-add time_ago_in_wordsBob Van Landuyt2017-06-151-0/+35
| * | | | Make sure there's only 1 `errors.messages` definition in en.ymlBob Van Landuyt2017-06-151-6/+4
View Lorry Controller Status