summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'fix/gem-security-updates' into 'master'Robert Speicher2017-08-314-30/+33
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade mail and nokogiri gems due to security issues See merge request !13662
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document swappiness recomendations in the requirements doc See merge request !13943
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename prometheus Vue components See merge request !13938
| * | | | | | | | | | 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 consistent See merge request !13628
| * | | | | | | | | | 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 dropdowns Closes #36766 and #36866 See merge request !13889
| * | | | | | | | | | Increase z-index of dropdownsdropdown-z-index-updatePhil Hughes2017-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #36866, #36766
* | | | | | | | | | | Merge branch 'fix-timeago-tooltip-attribute' into 'master'Filipa Lacerda2017-08-302-1/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid attribute used for time-ago-tooltip component Closes #37163 See merge request !13899
| * | | | | | | | | | 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 doc See merge request !13924
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unwanted refs after importing a project Closes #36807 See merge request !13766
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-3121-319/+310
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36807-gc-unwanted-refs-after-import * upstream/master: Don't use public_send in destroy_conditionally! helper Fix MySQL failure for emoji autocomplete max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably) Replace 'project/user_lookup.feature' spinach test with an rspec analog Move GPG signed commits docs to new location
| * | | | | | | | | | | 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 ↵Lin Jen-Shin2017-08-30577-3841/+8865
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36807-gc-unwanted-refs-after-import * upstream/master: (225 commits) Add changelog entry Backports EE 2756 logic to CE. Make rubocop happy Make profile settings dropdown consistent Add filter by my reaction Update spec initialization with it being a shared component Update identicon path and selector Renamed to `identicon` and make shared component Merge branch 'master-i18n' into 'master' Fix broken Frontend JS guide Replace 'project/star.feature' spinach test with an rspec analog Adds position fixed to right sidebar Fixes the margin of the top buttons of the pipeline page Remove commented out code Better align fallback image emojis Decrease Metrics/CyclomaticComplexity threshold to 15 Add changelog Respect the default visibility level when creating a group Further break with_repo_branch_commit into parts Make sure inspect doesn't generate crazy string ...
| * | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that whenever we want to reserve more, we're aware, and don't mess it up.
| * | | | | | | | | | | | Resolve feedback on the MR:Lin Jen-Shin2017-08-255-47/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13766 * Rename AfterImportService * Use constants * Move Git operations to Gitlab::Git::Repository * Use Regexp.union
| * | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | take the advantage that if they're not used, we could garbage collect those data, reducing memory footprint.
| * | | | | | | | | | | | Add changelog and testsLin Jen-Shin2017-08-235-3/+88
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove unwanted refs after importing a projectLin Jen-Shin2017-08-233-1/+36
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we don't need them, and they would slow down the repository, keeping unneeded objects as well. We could also consider doing this in regular housekeeping.
* | | | | | | | | | | | Merge branch 'check-trigger-permissions-mysql' into 'master'Douwe Maan2017-08-306-8/+137
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve migrations using triggers Closes #36633 See merge request !13666
| * | | | | | | | | | | | Improve migrations using triggerscheck-trigger-permissions-mysqlYorick Peterse2017-08-296-8/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a bunch of checks to migrations that may create or drop triggers. Dropping triggers/functions is done using "IF EXISTS" so we don't throw an error if the object in question has already been dropped. We now also raise a custom error (message) when the user does not have TRIGGER privileges. This should prevent the schema from entering an inconsistent state while also providing the user with enough information on how to solve the problem. The recommendation of using SUPERUSER permissions is a bit extreme but we require this anyway (Omnibus also configures users with this permission). Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36633
* | | | | | | | | | | | | Merge branch '28453-add-time-estimate-time-spent-to-api-issue-output' into ↵Robert Speicher2017-08-309-17/+207
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add time stats to Issue and Merge Request API Closes #28453 See merge request !13335
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed tooltips from new sidebar Closes #35658 See merge request !13489
| * | | | | | | | | | | | | | Remove tooltips from new sidebarremove-sidebar-titlePhil Hughes2017-08-306-38/+47
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #35658
* | | | | | | | | | | | | | Merge branch 'harishsr-update-share-project-with-groups-docs' into 'master'Marcia Ramos2017-08-304-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update share project with groups docs See merge request !13843
| * | | | | | | | | | | | | 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 analog See merge request !13863
| * | | | | | | | | | | | | Replace 'project/user_lookup.feature' spinach test with an rspec analogblackst0ne2017-08-305-65/+49
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '37231-mysql2-error-unknown-column-award_emoji-count-on-master' ↵Grzegorz Bizon2017-08-304-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Mysql2::Error: Unknown column 'award_emoji.count' on master" Closes #37231 See merge request !13926
| * | | | | | | | | | | | | Don't use public_send in destroy_conditionally! helperSean McGivern2017-08-303-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we only override in two places, we could just ask for the value rather than the method name.
View Lorry Controller Status