summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'label-event' into 'master'51233-process-urls-with-spaces-to-support-old-attachment-uploadsJan Provaznik2018-09-0757-174/+1191
|\
| * Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-0757-174/+1191
|/
* Merge branch 'zj-cleanup-port-gitaly' into 'master'Douwe Maan2018-09-075-66/+73
|\
| * Port cleanup tasks to use GitalyZeger-Jan van de Weg2018-09-075-66/+73
* | Merge branch 'da-find-remote-root-ref' into 'master'Stan Hu2018-09-073-1/+16
|\ \
| * | Encode remote root refDouglas Barbosa Alexandre2018-09-073-1/+16
|/ /
* | Merge branch 'leipert-dedupe-dependencies' into 'master'Phil Hughes2018-09-071-113/+17
|\ \
| * | Dedupe frontend dependenciesLukas Eipert2018-09-071-113/+17
* | | Merge branch 'patch-28' into 'master'Douwe Maan2018-09-071-0/+2
|\ \ \
| * | | Update robots.txt (#51167)Moritz Schlarb2018-09-071-0/+2
| | |/ | |/|
* | | Merge branch 'ide-commit-panel-improved' into 'master'Tim Zallmann2018-09-0720-122/+356
|\ \ \
| * | | i18n on some stringsPhil Hughes2018-09-074-10/+22
| * | | de-duplicate gitlab-svgLukas Eipert2018-09-071-5/+1
| * | | added CHANGELOGPhil Hughes2018-09-071-0/+5
| * | | karma fixesPhil Hughes2018-09-072-8/+26
| * | | fixed `list_item_spec.js`Phil Hughes2018-09-071-1/+1
| * | | update state when staging/unstaging allPhil Hughes2018-09-074-6/+21
| * | | fixed discard modal not showingPhil Hughes2018-09-073-10/+11
| * | | fixed testsPhil Hughes2018-09-072-15/+6
| * | | design improvementsPhil Hughes2018-09-075-27/+54
| * | | update components to match designs in commit sectionPhil Hughes2018-09-078-29/+82
| * | | Improved IDE commit flowPhil Hughes2018-09-079-49/+165
| | |/ | |/|
* | | Merge branch '51225-fix-artifact-tests-in-jobs_controller_spec' into 'master'Grzegorz Bizon2018-09-071-4/+4
|\ \ \ | |/ / |/| |
| * | Check if key is present with string not symbolSteve Azzopardi2018-09-071-4/+4
* | | Merge branch 'boards-querystring-backport' into 'master'Tim Zallmann2018-09-077-78/+80
|\ \ \ | |/ / |/| |
| * | don't add trailing = when in urlParamsToArray functionSimon Knox2018-08-297-78/+80
* | | Merge branch 'fix-namespace-uploader' into 'master'Kamil Trzciński2018-09-073-9/+28
|\ \ \
| * | | Fix NamespaceUploader.base_dir for remote uploadsfix-namespace-uploaderJarka Kadlecová2018-08-213-9/+28
* | | | Merge branch 'ide-file-templates' into 'master'Tim Zallmann2018-09-0720-33/+782
|\ \ \ \
| * | | | fixed double scrollPhil Hughes2018-09-075-16/+17
| * | | | fixed some bugs around with the template dropdownsPhil Hughes2018-09-076-11/+28
| * | | | added component specsPhil Hughes2018-09-078-22/+345
| * | | | regenerate gitlab.pot filePhil Hughes2018-09-071-3/+3
| * | | | renames file when template type is changedPhil Hughes2018-09-078-36/+162
| * | | | added quick create new file buttons to modalPhil Hughes2018-09-071-5/+35
| * | | | fixed action name changes after rebasePhil Hughes2018-09-073-4/+18
| * | | | Added file templates to the Web IDEPhil Hughes2018-09-076-1/+239
| | |_|/ | |/| |
* | | | Merge branch 'alerts-for-built-in-metrics' into 'master'Grzegorz Bizon2018-09-0735-27/+847
|\ \ \ \
| * \ \ \ Merge branch 'master' into 'alerts-for-built-in-metrics'Kamil Trzciński2018-09-06580-6464/+97997
| |\ \ \ \
| * | | | | Fix project_id migrationKamil Trzciński2018-09-061-2/+0
| * | | | | Fix common_metrics.ymlKamil Trzciński2018-09-062-1/+2
| * | | | | Split canary metrics into separate onesKamil Trzciński2018-09-061-1/+17
| * | | | | Fix migrationsKamil Trzciński2018-09-052-1/+1
| * | | | | Update docsKamil Trzciński2018-09-051-5/+5
| * | | | | Fix add index prometheus metricKamil Trzciński2018-09-051-1/+1
| * | | | | Move `prometheus_metrics:project_id` right after creation of prometheus metricsKamil Trzciński2018-09-051-0/+0
| * | | | | Fix query_series specsKamil Trzciński2018-09-051-1/+1
| * | | | | Fix concurrent index problemKamil Trzciński2018-09-054-2/+18
| * | | | | Improve MetricGroup specsKamil Trzciński2018-09-051-3/+8
| * | | | | Test production/development fixtures seedKamil Trzciński2018-09-052-0/+30