summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Colorize labels in search field (!11047)winh-visual-token-labelswinh2017-05-059-6/+217
|
* Introduce AjaxCache classwinh2017-05-052-0/+161
|
* Use LabelSerializer in label controllerswinh2017-05-055-3/+55
|
* Merge branch 'issue-boards-no-avatar' into 'master' Filipa Lacerda2017-05-058-12/+38
|\ | | | | | | | | | | | | Fixed avatar not displaying in issue boards Closes #31428 See merge request !10977
| * Changed how the default avatar is setissue-boards-no-avatarPhil Hughes2017-05-047-14/+33
| |
| * Merge branch 'master' into issue-boards-no-avatarPhil Hughes2017-05-04667-3440/+13617
| |\
| * | Fixed avatar not displaying in issue boardsPhil Hughes2017-04-284-1/+8
| | | | | | | | | | | | | | | | | | This happens when Gravatar is disabled in the admin settings, the avatar is returned as null & then frontend didn't do anything about it. Closes #31428
* | | Merge branch '27614-instant-comments' into 'master' Filipa Lacerda2017-05-0516-65/+607
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add instant comments support Closes #27614 See merge request !10760
| * | | Add instant comments supportKushal Pandya2017-05-0516-65/+607
|/ / /
* | | Merge branch '30237-pipelines-actions-make-2-requests' into 'master' Kamil Trzciński2017-05-053-3/+53
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve: "Pipelines: When we retry a pipeline 2 requests are made to the pipelines endpoint" Closes #30237 See merge request !10584
| * | | Add specs for new pipeline action for JSON format30237-pipelines-actions-make-2-requestsGrzegorz Bizon2017-05-051-0/+36
| | | |
| * | | Use wrap_parameters in pipelines controllerGrzegorz Bizon2017-05-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to workaround a bug in `safe_constantize` which caused a `LoadError` exception when doing ``` "Pipeline".safe_constantize LoadError: Unable to autoload constant Pipeline, expected /home/grzesiek/gdk/gitlab/app/models/ci/pipeline.rb to define it ``` See https://github.com/rails/rails/issues/28854 for more details.
| * | | Respond with no content for pipeline JSON actionsGrzegorz Bizon2017-05-051-6/+2
| | | |
| * | | Retry and cancel endpoints send 204 json response. Request is made with type ↵Filipa Lacerda2017-05-052-3/+19
| | | | | | | | | | | | | | | | json
* | | | Merge branch 'merge-request-poll-json-endpoint' into 'master' Filipa Lacerda2017-05-052-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug where merge request JSON would show Closes #28909 See merge request !11096
| * | | | Fixed bug where merge request JSON would showmerge-request-poll-json-endpointPhil Hughes2017-05-042-1/+5
| | |_|/ | |/| | | | | | | | | | Closes #28909
* | | | Merge branch 'adam-separate-slash-commands' into 'master' Rémy Coutable2017-05-0528-133/+785
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display slash commands outcome when previewing Markdown Closes #21531 See merge request !10054
| * | | | Display slash commands outcome when previewing Markdownadam-separate-slash-commandsRares Sfirlogea2017-05-0428-133/+785
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove slash commands from Markdown preview and display their outcome next to the text field. Introduce new "explanation" block to our slash commands DSL. Introduce optional "parse_params" block to slash commands DSL that allows to process a parameter before it is passed to "explanation" or "command" blocks. Pass path for previewing Markdown as "data" attribute instead of setting a variable on "window".
* | | | | Merge branch '31552-documentation-dos-and-donts' into 'master' Phil Hughes2017-05-052-283/+334
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Documentation: Frontend list of do's and don'ts" Closes #31552 See merge request !11091
| * | | | | Changes after review31552-documentation-dos-and-dontsFilipa Lacerda2017-05-041-19/+13
| | | | | |
| * | | | | Add missing pointsFilipa Lacerda2017-05-041-8/+70
| | | | | |
| * | | | | Adds numbered lists to easily point to documentationFilipa Lacerda2017-05-042-282/+277
| | | | | |
* | | | | | Merge branch 'manual-build-trigger' into 'master' Marin Jankovski2017-05-053-0/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a manual job to trigger package build in omnibus Closes omnibus-gitlab#2234 See merge request !11086
| * | | | | | Add a manual job to trigger package build in omnibusBalasankar C2017-05-053-0/+59
|/ / / / / /
* | | | | | Merge branch '29145-oauth-422' into 'master' Phil Hughes2017-05-055-12/+143
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update design of auth error page Closes #29145 See merge request !11099
| * | | | | | Update design of auth error pageAnnabel Dunstone Gray2017-05-055-12/+143
|/ / / / / /
* | | | | | Merge branch '31810-commit-link' into 'master' Phil Hughes2017-05-052-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove # char for commit Closes #31810 See merge request !11093
| * | | | | | Remove # char for commitFilipa Lacerda2017-05-052-1/+5
|/ / / / / /
* | | | | | Merge branch '28433-internationalise-cycle-analytics-page' into 'master' Douwe Maan2017-05-0569-81/+1829
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalise Cycle Analytics page Closes #28433 See merge request !10669
| * | | | | | Some small updates for Spanish translations.Ruben Davila2017-05-0410-32/+32
| | | | | | |
| * | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-04395-1955/+9430
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb
* | | | | | | Merge branch 'dm-fix-cycle-analytics-stage-legends' into 'master' Robert Speicher2017-05-043-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wording of Cycle Analytics stage legends See merge request !11106
| * | | | | | | Fix wording of Cycle Analytics stage legendsDouwe Maan2017-05-043-3/+3
|/ / / / / / /
* | | | | | | Merge branch '2274-store-last-repository-updated-at-ce' into 'master' Robert Speicher2017-05-0410-16/+95
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of "2274-store-last-repository-updated-at" to CE See merge request !11085
| * | | | | | | Fix Import/Export configuration spec2274-store-last-repository-updated-at-ceDouglas Barbosa Alexandre2017-05-041-0/+1
| | | | | | | |
| * | | | | | | Update last_repository_updated_at when the wiki is updatedDouglas Barbosa Alexandre2017-05-042-7/+16
| | | | | | | |
| * | | | | | | Update last_repository_updated_at when a push event is createdDouglas Barbosa Alexandre2017-05-042-8/+40
| | | | | | | |
| * | | | | | | Set last_repository_updated_at to created_at upon project creationDouglas Barbosa Alexandre2017-05-042-0/+13
| | | | | | | |
| * | | | | | | Add index to last_repository_updated_at on projectsDouglas Barbosa Alexandre2017-05-042-1/+17
| | | | | | | |
| * | | | | | | Add last_repository_updated_at to projectsDouglas Barbosa Alexandre2017-05-042-1/+9
| | | | | | | |
* | | | | | | | Merge branch '30329-web-gui-unable-to-create-new-branch-from-commit-sha' ↵Jacob Schatz2017-05-045-9/+75
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Web GUI: Unable to create new branch from commit SHA" Closes #30329 See merge request !10738
| * | | | | | | Resolve "Web GUI: Unable to create new branch from commit SHA"Luke "Jared" Bennett2017-05-045-9/+75
|/ / / / / / /
* | | | | | | Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master' Jacob Schatz2017-05-044-3/+51
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR target branch select dropdown placement cut-off Closes #31271 See merge request !10902
| * | | | | | Fix MR target branch selector dropdown placement cut-off31271-fixmr-target-branch-selector-dropdownEric Eastwood2017-05-014-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31271 When the dropdown items are too wide, constrain the dropdown to the offsetParent. Otherwise, let it naturally flow as Select2 wants.
* | | | | | | Merge branch 'deploy-keys-load-async' into 'master' Filipa Lacerda2017-05-0427-37/+961
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy keys load async Closes #29667 See merge request !10973
| * | | | | | | Fixed Karma specdeploy-keys-load-asyncPhil Hughes2017-05-042-4/+13
| | | | | | | |
| * | | | | | | Updated webpack configPhil Hughes2017-05-042-5/+2
| | | | | | | |
| * | | | | | | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-04203-1298/+4346
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Fixed karma specsPhil Hughes2017-05-031-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-03472-2184/+8995
| |\ \ \ \ \ \ \