summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix docfeature/sm/2783-rename-codeclimate-to-codequality-ceShinya Maeda2017-08-311-3/+1
* Squashed commit of the following:Shinya Maeda2017-08-312-4/+9
* Merge branch 'fix/gem-security-updates' into 'master'Robert Speicher2017-08-314-30/+33
|\
| * Upgrade mail and nokogiri gems due to security issuesMarkus Koller2017-08-314-30/+33
|/
* Merge branch 'swappiness-req-doc' into 'master'Stan Hu2017-08-311-1/+3
|\
| * Link out to stackoverflow answer on setting swappinessDJ Mountney2017-08-301-3/+3
| * Document swappiness recomendations in the requirements docDJ Mountney2017-08-301-1/+3
|/
* Merge branch 'refactor-prometheus-graph-layout' into 'master'Fatih Acet2017-08-3016-131/+127
|\
| * update specs to match reorganized monitoring componentsrefactor-prometheus-graph-layoutMike Greiling2017-08-307-36/+39
| * extract prometheus graph group elements into their own componentMike Greiling2017-08-302-16/+34
| * remove pointless single-row/single-col wrapperMike Greiling2017-08-291-16/+12
| * rename and organize vue componentsMike Greiling2017-08-298-32/+31
| * refactor template formatting according to guidelinesMike Greiling2017-08-293-52/+32
* | Merge branch 'winh-new-project-dropdowns' into 'master'Clement Ho2017-08-301-0/+1
|\ \
| * | Make namespace dropdown on new project page consistentwinh-new-project-dropdownswinh2017-08-301-0/+1
| |/
* | Merge branch 'dropdown-z-index-update' into 'master'Filipa Lacerda2017-08-301-1/+1
|\ \
| * | Increase z-index of dropdownsdropdown-z-index-updatePhil Hughes2017-08-291-1/+1
* | | Merge branch 'fix-timeago-tooltip-attribute' into 'master'Filipa Lacerda2017-08-302-1/+11
|\ \ \
| * | | Fix invalid attribute used for time-ago-tooltip componentClement Ho2017-08-302-1/+11
|/ / /
* | | Merge branch 'docs-improve-latest-artifacts' into 'master'Marcia Ramos2017-08-301-6/+11
|\ \ \
| * | | Update latest artifacts docFabio Busatto2017-08-301-6/+11
|/ / /
* | | Merge branch '36807-gc-unwanted-refs-after-import' into 'master'Douwe Maan2017-08-3013-14/+194
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master' into 36807-gc-unwanted-refs-af...Lin Jen-Shin2017-08-3121-319/+310
| |\ \ \
| * | | | Use `git update-ref --stdin -z` to delete refs36807-gc-unwanted-refs-after-importLin Jen-Shin2017-08-305-5/+53
| * | | | Merge remote-tracking branch 'upstream/master' into 36807-gc-unwanted-refs-af...Lin Jen-Shin2017-08-30577-3841/+8865
| |\ \ \ \
| * | | | | Just use a blockLin Jen-Shin2017-08-291-1/+1
| * | | | | Fix testsLin Jen-Shin2017-08-282-8/+8
| * | | | | Try to make reserved ref names more obviousLin Jen-Shin2017-08-255-10/+19
| * | | | | Resolve feedback on the MR:Lin Jen-Shin2017-08-255-47/+46
| * | | | | Move to Projects::HousecleaningServiceLin Jen-Shin2017-08-245-49/+47
| * | | | | Use block rather than just bLin Jen-Shin2017-08-241-4/+4
| * | | | | Just use @project directlyLin Jen-Shin2017-08-241-4/+2
| * | | | | Just use methods over constants, so that we couldLin Jen-Shin2017-08-242-7/+15
| * | | | | Add changelog and testsLin Jen-Shin2017-08-235-3/+88
| * | | | | Remove unwanted refs after importing a projectLin Jen-Shin2017-08-233-1/+36
* | | | | | Merge branch 'check-trigger-permissions-mysql' into 'master'Douwe Maan2017-08-306-8/+137
|\ \ \ \ \ \
| * | | | | | Improve migrations using triggerscheck-trigger-permissions-mysqlYorick Peterse2017-08-296-8/+137
* | | | | | | Merge branch '28453-add-time-estimate-time-spent-to-api-issue-output' into 'm...Robert Speicher2017-08-309-17/+207
|\ \ \ \ \ \ \
| * | | | | | | Add changelogTravis Miller2017-08-291-0/+4
| * | | | | | | Add time stats to issue and merge request API end pointsTravis Miller2017-08-293-13/+39
| * | | | | | | Resolve new N+1 by adding preloads and metadata to issues end pointsTravis Miller2017-08-292-5/+39
| * | | | | | | Add missing N+1 test to issues specTravis Miller2017-08-291-0/+12
| * | | | | | | Add time stats to API schema for issue and merge request end pointsTravis Miller2017-08-292-2/+14
| * | | | | | | Add time stats documentation to issue and merge request end pointsTravis Miller2017-08-292-8/+110
* | | | | | | | Merge branch 'remove-sidebar-title' into 'master'Annabel Dunstone Gray2017-08-306-38/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove tooltips from new sidebarremove-sidebar-titlePhil Hughes2017-08-306-38/+47
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'harishsr-update-share-project-with-groups-docs' into 'master'Marcia Ramos2017-08-304-8/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update share project with groups docsHarish Ramachandran2017-08-304-8/+11
|/ / / / / / /
* | | | | | | Merge branch 'replace_spinach_user_lookup.feature' into 'master'Robert Speicher2017-08-305-65/+49
|\ \ \ \ \ \ \
| * | | | | | | Replace 'project/user_lookup.feature' spinach test with an rspec analogblackst0ne2017-08-305-65/+49
View Lorry Controller Status