summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Upgrade Nokogiri because of CVE-2017-9050winh-upgrade-nokogiriWinnie Hellmann2017-09-212-5/+5
* Merge branch 'cache-csrf-token' into 'master'Phil Hughes2017-09-215-12/+112
|\
| * Standardize access to CSRF token in JavaScriptBryce Johnson2017-09-215-12/+112
|/
* Merge branch 'hide-frontmatter-help-page' into 'master'Robert Speicher2017-09-211-2/+8
|\
| * Do not show YAML frontmatter for doc pages under /helpAchilleas Pipinellis2017-09-191-2/+8
* | Merge branch 'force-two-up-view' into 'master'Filipa Lacerda2017-09-212-6/+19
|\ \
| * | [skip ci] Add changelogforce-two-up-viewClement Ho2017-09-201-0/+5
| * | Force two up viewClement Ho2017-09-201-6/+14
| |/
* | Merge branch 'bvl-transient-failure-health-controller-spec' into 'master'Douwe Maan2017-09-211-2/+2
|\ \
| * | Don't memoize storage configuration on `FsShardsCheck`bvl-transient-failure-health-controller-specBob Van Landuyt2017-09-211-2/+2
* | | Merge branch 'dm-closing-issue-urls' into 'master'Robert Speicher2017-09-213-3/+8
|\ \ \
| * | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptionsdm-closing-issue-urlsDouwe Maan2017-09-213-3/+8
* | | | Merge branch '32894-update-ux-icon-documentation' into 'master'Marcia Ramos2017-09-212-12/+10
|\ \ \ \
| * | | | update spacing32894-update-ux-icon-documentationsarrahvesselov2017-09-201-0/+4
| * | | | updated verbiage and added todosarrahvesselov2017-09-201-1/+4
| * | | | added icon image and updated verbiagesarrahvesselov2017-09-192-12/+3
* | | | | Merge branch 'docs/owners-can-create-subgroups' into 'master'Marcia Ramos2017-09-211-4/+5
|\ \ \ \ \
| * | | | | Document that group Owners can always create subgroupsAchilleas Pipinellis2017-09-211-4/+5
| | |_|/ / | |/| | |
* | | | | Merge branch '32796-add-ee-tag-detection-to-remove-old-in-gitlab-backup' into...Rémy Coutable2017-09-212-6/+12
|\ \ \ \ \
| * | | | | Adds EE tag detection to remove_old in gitlab backup.Tiago Botelho2017-09-212-6/+12
| |/ / / /
* | | | | Merge branch 'docs/autodevops-cleanup' into 'master'Achilleas Pipinellis2017-09-214-200/+370
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Auto DevOps docs cleanupAchilleas Pipinellis2017-09-214-200/+370
|/ / / /
* | | | Merge branch 'docs-updates-sharing-permissions-and-project-filter' into 'master'Achilleas Pipinellis2017-09-211-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | new sharing permissionsMike Bartlett2017-09-211-0/+0
* | | | Merge branch '37220-es-modules' into 'master'Phil Hughes2017-09-2141-870/+931
|\ \ \ \
| * | | | Exports all the methods in the same place37220-es-modulesFilipa Lacerda2017-09-181-25/+28
| * | | | Merge branch 'master' into 37220-es-modulesMike Greiling2017-09-18357-4475/+7015
| |\ \ \ \
| * | | | | Fix context for jquery eventFilipa Lacerda2017-09-151-7/+5
| * | | | | fixed mr widget options specPhil Hughes2017-09-131-3/+2
| * | | | | fixed todos specPhil Hughes2017-09-122-28/+15
| * | | | | Merge branch 'master' into 37220-es-modulesFilipa Lacerda2017-09-12101-1184/+1735
| |\ \ \ \ \
| * | | | | | fixed location.pathname not being resetPhil Hughes2017-09-121-1/+1
| * | | | | | Import modules instead of using the ones in global namespaceFilipa Lacerda2017-09-0932-170/+233
| * | | | | | Use modules in common utilsFilipa Lacerda2017-09-0914-769/+779
* | | | | | | Merge branch 'feature/plantuml-restructured-text' into 'master'Douwe Maan2017-09-213-3/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Upgrade gitlab-markup gemMarkus Koller2017-09-203-3/+8
* | | | | | | Merge branch '38088-remove-banner-to-customize-experience' into 'master'Douwe Maan2017-09-216-157/+0
|\ \ \ \ \ \ \
| * | | | | | | Deleted another Fixture due to User Callout38088-remove-banner-to-customize-experienceTim Zallmann2017-09-201-30/+0
| * | | | | | | Fixture Creation removedTim Zallmann2017-09-201-5/+0
| * | | | | | | Deleted Karma Specs for userCalloutTim Zallmann2017-09-201-49/+0
| * | | | | | | Removed User Callout for Customer ExperienceTim Zallmann2017-09-204-73/+0
* | | | | | | | Merge branch 'events-redundant-where' into 'master'Rémy Coutable2017-09-213-7/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove redundant WHERE from event queriesevents-redundant-whereYorick Peterse2017-09-203-7/+12
* | | | | | | | | Merge branch 'remove-use-key-worker' into 'master'Rémy Coutable2017-09-218-65/+116
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Stop using Sidekiq for updating Key#last_used_atremove-use-key-workerYorick Peterse2017-09-208-65/+116
| |/ / / / / / / /
* | | | | | | | | Merge branch 'resolve-discussions-btn' into 'master'Phil Hughes2017-09-211-14/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make resolve discussion icon grayresolve-discussions-btnAnnabel Dunstone Gray2017-09-201-14/+6
* | | | | | | | | | Merge branch '10-0-sync-master' into 'master'Simon Knox2017-09-2116-79/+19
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJarka Kadlecova2017-09-2116-79/+19
| |\ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / /
| * | | | | | | | | | Update CHANGELOG.md for 9.5.5Simon Knox2017-09-1816-79/+19
| | |_|_|_|_|_|/ / / | |/| | | | | | | |