summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-migrate-repo-size-migration' into 'master' Robert Speicher2016-04-181-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use raw SQL commands for 20140502125220 MigrateRepoSize Partial fix for #15210 See merge request !3789
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use raw SQL commands for 20140502125220 MigrateRepoSizeStan Hu2016-04-181-7/+14
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial fix for #15210
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mobile-header-overlap' into 'master' Jacob Schatz2016-04-181-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed overlap in header on mobile ![Screen_Shot_2016-04-18_at_08.48.29](/uploads/8f371d0c717a57ca7afb29415e13d96c/Screen_Shot_2016-04-18_at_08.48.29.png) See merge request !3777
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed overlap in header on mobilemobile-header-overlapPhil Hughes2016-04-181-1/+5
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dropzone-class-remove' into 'master' Jacob Schatz2016-04-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes dropzone focus class after dropping file See merge request !3756
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes dropzone focus class after dropping filedropzone-class-removePhil Hughes2016-04-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'note-form-focus-color' into 'master' Jacob Schatz2016-04-181-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated note form focus to better match form-control focus ![Screen_Shot_2016-04-15_at_09.47.52](/uploads/39e02f79a72798ecc6dc946c7b3c8e2e/Screen_Shot_2016-04-15_at_09.47.52.png) See merge request !3739
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated note form focus to better match form-control focusnote-form-focus-colorPhil Hughes2016-04-151-3/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'parallel-diff' into 'master' Jacob Schatz2016-04-181-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap code in parallel view Code scrolling was breaking the parallel layout. It should wrap on 'Side-by-side' mode <img src="/uploads/db657e6c7f08ce57f1be615d7193136a/Screen_Shot_2016-04-14_at_4.28.31_PM.png" width="700px"> See merge request !3731
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap code in parallel viewparallel-diffAnnabel Dunstone2016-04-141-0/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'commit-timeago-fix' into 'master' Jacob Schatz2016-04-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with commit time not using timeago See merge request !3723
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with commit time not using timeagocommit-timeago-fixPhil Hughes2016-04-141-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'diff-js-error-fix' into 'master' Robert Speicher2016-04-181-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with spinner not hiding on diff changes See merge request !3793
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with spinner not hiding on diff changesPhil Hughes2016-04-181-3/+4
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tag-grape-allowed' into 'master' Robert Speicher2016-04-182-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "action" tag to /internal/allowed API See merge request !3791
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "action" tag to /internal/allowed APIYorick Peterse2016-04-182-2/+5
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to re-use any other analytics that rely on the "action" tag having a value set.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'issue_3508' into 'master' Douwe Maan2016-04-189-20/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict public users for private instances Implements #3508 See merge request !3440
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entryFelipe Artur2016-04-182-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix documentation and improve permissions codeFelipe Artur2016-04-186-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Insert instructions in admin page and permissions documentFelipe Artur2016-04-182-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove group members checkFelipe Artur2016-04-185-24/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Insert users check into apiFelipe Artur2016-04-185-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Code fixesFelipe Artur2016-04-185-28/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix specsFelipe Artur2016-04-182-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix codeFelipe Artur2016-04-185-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs and fix codeFelipe Artur2016-04-186-18/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Move verification to abilitiesFelipe Artur2016-04-185-12/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict user profiles based on restricted visibility levelsFelipe Artur2016-04-182-0/+8
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'transaction-query-count' into 'master' Rémy Coutable2016-04-183-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Count the number of SQL queries per transaction cc @pcarranza See merge request !3783
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Count the number of SQL queries per transactionYorick Peterse2016-04-183-0/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15335
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tasklist-fix' into 'master' Jacob Schatz2016-04-182-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with tasklist toggling sidebar refresh Closes #15270 See merge request !3782
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with tasklist toggling sidebar refreshtasklist-fixPhil Hughes2016-04-182-6/+0
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15270
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'import-feedback' into 'master' Jacob Schatz2016-04-189-41/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added loading icon to import buttons See #14488 for more details See merge request !3662
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Addressed feedbackPhil Hughes2016-04-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Variable nameimport-feedbackPhil Hughes2016-04-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Updated based on feedbackPhil Hughes2016-04-148-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Moved loading icon to match todo loading iconPhil Hughes2016-04-127-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Added loading icon to import buttonsPhil Hughes2016-04-118-39/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #14488 for more details
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'print-style' into 'master' Jacob Schatz2016-04-183-13/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print style [test.pdf](/uploads/0dab5c1b2d0c4d0cd7e8930e9b660a9f/test.pdf) Closes #14201 See merge request !3784
| * | | | | | | | | | | | | | | | | | | | | | | | | | | CHANGELOG itemprint-stylePhil Hughes2016-04-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Updated print stylePhil Hughes2016-04-182-13/+33
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14201
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'discussion-notes' into 'master' Jacob Schatz2016-04-186-19/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion notes update - At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues - Moved the dates to be in the header like other notes - Fixed overlapping issue on mobile See merge request !3720
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fixed testsdiscussion-notesPhil Hughes2016-04-142-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Dicussion action mobile fixPhil Hughes2016-04-141-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Discussion notes updatePhil Hughes2016-04-147-31/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues Moved the dates to be in the header like other notes Fixed overlapping issue on mobile
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'feature/ci-job-env-variables' into 'master' Grzegorz Bizon2016-04-188-35/+168
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add environment variables on a job level in CI Make it possible to define environment variables on a job level. Closes #14716 See merge request !3612
| * | | | | | | | | | | | | | | | | | | | | | | | | | Minor refactorings in CI configfeature/ci-job-env-variablesGrzegorz Bizon2016-04-182-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add minor fixes in docs for job-specific variablesGrzegorz Bizon2016-04-182-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Validate job-level variables in YAML config fileGrzegorz Bizon2016-04-182-13/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation on job level build variablesGrzegorz Bizon2016-04-181-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | |