summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-066-39/+9
|\
| * updated the ignore_column concern to support multiple columnsmicael.bergeron2017-11-061-2/+2
| * ignore the column before the migrationmicael.bergeron2017-11-061-1/+2
| * removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-035-36/+5
* | Merge branch 'revert-unintentional-changes-in-mr-12810' into 'master'Annabel Dunstone Gray2017-11-069-196/+101
|\ \
| * | Revert unintentional changes in !12810Takuya Noguchi2017-11-069-196/+101
* | | Merge branch 'pawel/show_empty_page_when_prometheus_metrics_are_disabled-3563...Sean McGivern2017-11-061-7/+9
|\ \ \
| * | | Make Prometheus metrics endpoint return empty response when metrics are disabledpawel/show_empty_page_when_prometheus_metrics_are_disabled-35639Pawel Chojnacki2017-09-251-7/+9
* | | | Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López2017-11-0615-22/+79
* | | | Merge branch 'dm-block-group-and-project-creation-when-external-by-default' i...Sean McGivern2017-11-061-3/+4
|\ \ \ \
| * | | | Make sure group and project creation is blocked for new users that are extern...Douwe Maan2017-11-061-3/+4
* | | | | Merge branch '39668-tooltip-safari' into 'master'Tim Zallmann2017-11-061-0/+5
|\ \ \ \ \
| * | | | | Remove native title tooltip in pipeline jobs dropdown in Safari39668-tooltip-safariFilipa Lacerda2017-11-061-0/+5
* | | | | | Merge branch 'dm-reallow-project-path-ending-in-period' into 'master'Sean McGivern2017-11-068-58/+94
|\ \ \ \ \ \
| * | | | | | Reallow project paths ending in periodsdm-reallow-project-path-ending-in-periodDouwe Maan2017-11-068-58/+94
| | |/ / / / | |/| | | |
* | | | | | Remove create MR button from issues when MRs are disabledGeorge Andrinopoulos2017-11-061-11/+16
* | | | | | Merge branch 'jk-delete-epic-backport' into 'master'Sean McGivern2017-11-063-25/+20
|\ \ \ \ \ \
| * | | | | | Refactor issuable destroy actionJarka Kadlecova2017-11-063-25/+20
| | |_|_|_|/ | |/| | | |
* | | | | | Resolve "Editor icons"Tim Zallmann2017-11-0614-36/+57
* | | | | | Merge branch 'ce-gitlab-git-backport' into 'master'Sean McGivern2017-11-065-55/+14
|\ \ \ \ \ \
| * | | | | | Use Gitlab::Git operations for repository mirroringce-gitlab-git-backportAlejandro Rodríguez2017-11-032-33/+0
| * | | | | | Encapsulate git operations for mirroring in Gitlab::GitAlejandro Rodríguez2017-11-033-18/+9
| * | | | | | Create a Wiki Repository's raw_repository properlyAlejandro Rodríguez2017-11-032-4/+5
* | | | | | | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-062-1/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Use diff_discussion? instead of is_a?(DiffDiscussion)38677-render-new-discussions-on-diff-tabLuke "Jared" Bennett2017-11-021-1/+1
| * | | | | | FE review changes - remove internal details assertion and look for closest fo...Luke "Jared" Bennett2017-10-271-1/+1
| * | | | | | Fix karmaLuke "Jared" Bennett2017-10-231-1/+1
| * | | | | | Remove trailing commaLuke "Jared" Bennett2017-10-211-1/+1
| * | | | | | Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-211-1/+2
| * | | | | | Added discussion_line_code value to note response and use it to query the rig...Luke "Jared" Bennett2017-10-212-2/+4
* | | | | | | Remove unique validation from external_url in Environmentfix/sm/37299-environments-validate-uniqueness-on-url-and-can-cause-silent-deployment-failuresShinya Maeda2017-11-061-1/+0
* | | | | | | Expose project visibility as CI variableMatija Čupić2017-11-041-1/+2
* | | | | | | Merge branch 'sh-headless-chrome-support' into 'master'Stan Hu2017-11-038-22/+25
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-0355-700/+869
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-0293-1040/+1187
| |\ \ \ \ \ \ \ \
| * | | | | | | | | remove PhantomJS specific hacksMike Greiling2017-10-314-15/+0
| * | | | | | | | | fix edit token regression within spec/features/issues/filtered_search/visual_...Mike Greiling2017-10-311-2/+0
| * | | | | | | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-31111-1948/+2242
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | add missing parameter to triggerEventsMike Greiling2017-10-311-1/+1
| * | | | | | | | | | fix page render issues on contribution calendar while tests are runMike Greiling2017-10-301-5/+0
| * | | | | | | | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-2991-460/+1373
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '35955-searchable-settings-puts-expand-collapse-toggle-in-an-inv...Mike Greiling2017-10-238-51/+55
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Stop sections from expanding when scrolling over the 1px sectionEric Eastwood2017-10-171-0/+4
| | * | | | | | | | | | | update settings panels to place "expanded" class on the correct elementMike Greiling2017-10-146-24/+24
| | * | | | | | | | | | | remove needlessly complicated, duplicate css class for expanded settings panelsMike Greiling2017-10-142-27/+27
| * | | | | | | | | | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-23182-2348/+3438
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add InputHelper rspec helper to simulate non-BMP character inputMike Greiling2017-10-172-0/+25
* | | | | | | | | | | | | | Merge branch '39771-fix-clusters-settings-expanded-options' into 'master'Filipa Lacerda2017-11-031-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix clusters description text collapsing away on page-load39771-fix-clusters-settings-expanded-optionsEric Eastwood2017-11-031-6/+6
* | | | | | | | | | | | | | Merge branch 'issue_39176' into 'master'Douwe Maan2017-11-031-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |