summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mock prometheus datamultiple-query-prometheus-graphs-mockedMike Greiling2017-11-062-10/+48
* fix karma failuresMike Greiling2017-11-064-4/+4
* add dashed and dotted line styles for multiple-query graphsMike Greiling2017-11-064-10/+31
* add track information to data legendMike Greiling2017-11-061-3/+7
* process all queries within a graphMike Greiling2017-11-061-16/+24
* pass all graph queries into createTimeSeriesMike Greiling2017-11-062-2/+3
* fix bug in which axes are scaled only to first data setMike Greiling2017-11-061-2/+3
* Merge branch 'ignore-legacy-routes-in-routing-spec' into 'master'Douwe Maan2017-11-061-3/+16
|\
| * Ignore routes matching legacy_*_redirect in route specsSean McGivern2017-11-061-3/+16
* | Merge branch '38597-editor-icons' into 'master'Phil Hughes2017-11-0615-37/+58
|\ \
| * | Resolve "Editor icons"Tim Zallmann2017-11-0615-37/+58
|/ /
* | Merge branch 'docs/add-link-to-brand-ai' into 'master'Achilleas Pipinellis2017-11-061-1/+5
|\ \
| * | Add link to GitLab brand.ai pagedocs/add-link-to-brand-aiEric Eastwood2017-11-021-1/+5
* | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2017-11-0615-1346/+5585
|\ \ \
| * | | Merge branch 'master-i18n' into 'master'Douwe Maan2017-11-0615-1346/+5585
* | | | Merge branch 'expose-job-duration' into 'master'Rémy Coutable2017-11-063-1/+17
|\ \ \ \
| * | | | Expose `duration` in Job API entityMehdi Lahmam2017-11-053-1/+17
* | | | | Merge branch 'jej/fix-lfs-changes-laziness' into 'master'Douwe Maan2017-11-066-46/+108
|\ \ \ \ \
| * | | | | Gitlab::Git::RevList and LfsChanges use lazy popenjej/fix-lfs-changes-lazinessJames Edwards-Jones2017-11-064-44/+84
| * | | | | Gitlab::Git::Popen can lazily hand output to a blockJames Edwards-Jones2017-11-062-2/+24
* | | | | | Merge branch 'ce-gitlab-git-backport' into 'master'Sean McGivern2017-11-0611-80/+228
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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-038-43/+188
| * | | | | Create a Wiki Repository's raw_repository properlyAlejandro Rodríguez2017-11-033-4/+25
| * | | | | Add `Gitlab::Git::Repository#fetch` commandAlejandro Rodríguez2017-11-031-0/+15
* | | | | | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-065-3/+33
|\ \ \ \ \ \
| * | | | | | Use diff_discussion? instead of is_a?(DiffDiscussion)38677-render-new-discussions-on-diff-tabLuke "Jared" Bennett2017-11-021-1/+1
| * | | | | | Added changelogLuke "Jared" Bennett2017-10-301-0/+5
| * | | | | | FE review changes - remove internal details assertion and look for closest fo...Luke "Jared" Bennett2017-10-272-5/+1
| * | | | | | Add spec for root diff discussion noteLuke "Jared" Bennett2017-10-241-2/+22
| * | | | | | Fix karmaLuke "Jared" Bennett2017-10-232-1/+2
| * | | | | | Remove trailing commaLuke "Jared" Bennett2017-10-211-1/+1
| * | | | | | Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-212-1/+7
| * | | | | | Added discussion_line_code value to note response and use it to query the rig...Luke "Jared" Bennett2017-10-212-2/+4
* | | | | | | Merge branch 'fix/sm/37299-environments-validate-uniqueness-on-url-and-can-ca...Kamil Trzciński2017-11-062-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unique validation from external_url in Environmentfix/sm/37299-environments-validate-uniqueness-on-url-and-can-cause-silent-deployment-failuresShinya Maeda2017-11-062-2/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fix/sm/39817-fix-cron_parser_spec-rb' into 'master'Rémy Coutable2017-11-061-6/+42
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add TimeCop freeze for DST and Regular timefix/sm/39817-fix-cron_parser_spec-rbShinya Maeda2017-11-051-6/+42
|/ / / / / /
* | | | | | Merge branch '37473-expose-project-visibility-as-ci-variable' into 'master'Kamil Trzciński2017-11-054-1/+9
|\ \ \ \ \ \
| * | | | | | Harcode project visibility37473-expose-project-visibility-as-ci-variableMatija Čupić2017-11-051-1/+1
| * | | | | | Expose project visibility as CI variableMatija Čupić2017-11-044-1/+9
* | | | | | | Merge branch 'fix_migration_that_adds_ff_merge_field' into 'master'Stan Hu2017-11-042-1/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | update a changelogValery Sizov2017-11-041-0/+5
| * | | | | | Put a condition to old migration that adds fast_forward column to MRsValery Sizov2017-11-041-1/+5
|/ / / / / /
* | | | | | Merge branch 'sh-headless-chrome-support' into 'master'Stan Hu2017-11-03149-456/+624
|\ \ \ \ \ \
| * | | | | | fix flaky tests by removing unneeded clicks and focus actionsMike Greiling2017-11-031-16/+1
| * | | | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-03102-834/+1294
| |\ \ \ \ \ \
| * | | | | | | fix flaky test in gfm_autocomplete_spec.rbMike Greiling2017-11-031-1/+0
| * | | | | | | don't attempt to click on hidden elementsMike Greiling2017-11-031-4/+6
| * | | | | | | replace use of unsupported trigger method with clickMike Greiling2017-11-032-2/+2
View Lorry Controller Status