summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use shared mediator with sidebar subscriptions39594-use-single-mediator-for-sidebarEric Eastwood2017-11-153-13/+17
* Merge branch 'master' of github.com:gitlabhq/gitlabhqFelipe Artur2017-11-140-0/+0
|\
* \ Merge branch dev/master into masterFelipe Artur2017-11-140-0/+0
|\ \ | |/ |/|
| * Prevent error when authorizing an admin-created OAauth application without a ...Douwe Maan2017-11-132-5/+14
| * Move update_project_counter_caches? out of issue and merge requestGeorge Andrinopoulos2017-11-137-39/+14
| * Add externalized stringsGeorge Andrinopoulos2017-11-132-4/+4
| * Add feature test to milestoneGeorge Andrinopoulos2017-11-132-0/+35
| * Move total time spend calculation to milestoneishGeorge Andrinopoulos2017-11-137-77/+24
| * Fix static code analysis offenceGeorge Andrinopoulos2017-11-131-1/+1
| * Fix collapsed sidebar messages and iconGeorge Andrinopoulos2017-11-135-6/+18
| * Add total time spent to milestonesGeorge Andrinopoulos2017-11-135-0/+82
* | Merge branch 'bvl-subgroup-in-dropdowns' into 'master'Sean McGivern2017-11-148-11/+161
|\ \
| * | Guarantee the order of groups in the dropdownbvl-subgroup-in-dropdownsBob Van Landuyt2017-11-141-2/+5
| * | Include child projects a user can manage in namespace dropdownsBob Van Landuyt2017-11-148-10/+157
* | | Merge branch 'update-metrics-for-k8s-1.7' into 'master'Tim Zallmann2017-11-142-8/+6
|\ \ \
| * | | Uodate docsupdate-metrics-for-k8s-1.7Joshua Lambert2017-11-121-2/+2
| * | | Change label to be more consistent, not a series.Joshua Lambert2017-11-121-4/+2
| * | | Fix CPU metricJoshua Lambert2017-11-121-2/+2
| * | | Fix to use variableJoshua Lambert2017-11-121-1/+1
| * | | Adjust metrics to ignore Job tag to support k8s 1.7+Joshua Lambert2017-11-121-2/+2
* | | | Merge branch 'fix-typo' into 'master'Annabel Dunstone Gray2017-11-141-1/+1
|\ \ \ \
| * | | | Fix typofix-typoClement Ho2017-11-131-1/+1
* | | | | Merge branch '32098-pipelines-navigation' into 'master'38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settingsPhil Hughes2017-11-1412-252/+385
|\ \ \ \ \
| * | | | | Stops page reload when changing tabs or pages - uses API requests insteadFilipa Lacerda2017-11-1412-252/+385
|/ / / / /
* | | | | Merge branch 'enable-scss-lint-unnecessary-mantissa' into 'master'Clement Ho2017-11-146-10/+15
|\ \ \ \ \
| * | | | | Enable UnnecessaryMantissa in scss-lintTakuya Noguchi2017-11-096-10/+15
* | | | | | Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'Yorick Peterse2017-11-143-2/+24
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Don't try to create fork network memberships for forks of forksbvl-fork-network-memberships-for-deleted-sourceBob Van Landuyt2017-11-143-2/+24
* | | | | | Merge branch 'issue_40058' into 'master'Sean McGivern2017-11-143-1/+13
|\ \ \ \ \ \
| * | | | | | Prevents position update for image diff notesissue_40058Felipe Artur2017-11-133-1/+13
* | | | | | | Merge branch 'fix-filter-by-my-reaction' into 'master'Sean McGivern2017-11-143-1/+60
|\ \ \ \ \ \ \
| * | | | | | | Fix filter by my reaction is not workingHiroyuki Sato2017-11-133-1/+60
* | | | | | | | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'Kamil Trzciński2017-11-1414-7/+172
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce changesfix/sm/31771-do-not-allow-jobs-to-be-erased-newShinya Maeda2017-11-072-30/+25
| * | | | | | | | Improve specShinya Maeda2017-11-073-29/+71
| * | | | | | | | Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-newShinya Maeda2017-11-07389-4435/+11572
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add doc. Fix spec. Add erase_build in protected_ref ruleShinya Maeda2017-11-0711-22/+71
| * | | | | | | | | Add change logShinya Maeda2017-11-061-0/+5
| * | | | | | | | | Fix spec. Revert update check.Shinya Maeda2017-11-064-6/+24
| * | | | | | | | | Do not allow jobs to be erasedShinya Maeda2017-11-068-4/+60
* | | | | | | | | | Merge branch '39884-fix-pipeline-transition-with-single-manual-action' into '...Kamil Trzciński2017-11-143-2/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make sure all pipelines would go to pending once39884-fix-pipeline-transition-with-single-manual-actionLin Jen-Shin2017-11-093-2/+32
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '40092-fix-cluster-size' into 'master'Tim Zallmann2017-11-144-2/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Formats bytes to human reabale number in registry table40092-fix-cluster-sizeFilipa Lacerda2017-11-134-2/+65
* | | | | | | | | | | Merge branch 'slack_landing_page-ce-backport' into 'master'Jacob Schatz2017-11-145-0/+55
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | backport popup varsslack_landing_page-ce-backportLuke "Jared" Bennett2017-11-131-0/+7
| * | | | | | | | | | | url_utility and style backportLuke "Jared" Bennett2017-11-134-0/+48
* | | | | | | | | | | | Merge branch '40127-spinach-deprecation' into 'master'Sean McGivern2017-11-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use #query_scope instead of #parent in a Spinach featureRémy Coutable2017-11-141-1/+1
* | | | | | | | | | | | | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-147-56/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status