summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Simplify system hook testing and guarantee test will firesh-simplify-system-hook-testingStan Hu2017-08-274-61/+63
| | | | | | | | | | | The change in !11728 would cause an arbitrary project to be chosen to test system hooks, and it's likely that the project would not have any commits or relevant commits to test the hook. This would prevent admins from verifying that the hook fired. Instead of trying to create a representative hook dynamically, just send static data to guarantee the hook will actually be tested. Closes #37067
* Merge branch 'fix-repo-scrollbar' into 'master'Jacob Schatz2017-08-251-1/+0
|\ | | | | | | | | | | | | Fix repo editor scrollbar Closes #37020 See merge request !13823
| * Fix repo editor scrollbarfix-repo-scrollbarClement Ho2017-08-241-1/+0
| |
* | Merge branch '36828-create-a-common-docker-documentation-resource-docs' into ↵Marcia Ramos2017-08-253-6/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Common Docker Documentation Location in `gitlab-ce` Closes #36828 See merge request !13749
| * | Common Docker Documentation Location in `gitlab-ce`Joshua Lambert2017-08-253-6/+20
|/ /
* | Merge branch 'docs-clarify-dependencies' into 'master'Achilleas Pipinellis2017-08-251-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Improve documentation for 'dependencies' keyword Closes #36857 See merge request !13758
| * | Update README.mddocs-clarify-dependenciesFabio Busatto2017-08-231-0/+2
| | |
* | | Merge branch 'sh-sidekiq-backtrace' into 'master'Robert Speicher2017-08-256-0/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable 5 lines of Sidekiq backtrace lines to aid in debugging Closes #27626 See merge request !13822
| * | | Enable 5 lines of Sidekiq backtrace lines to aid in debuggingsh-sidekiq-backtraceStan Hu2017-08-256-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Customers often have Sidekiq jobs that failed without much context. Without Sentry, there's no way to tell where these exceptions were hit. Adding in additional lines adds a bit more Redis storage overhead. This commit adds in backtrace logging for workers that delete groups/projects and import/export projects. Closes #27626
* | | | Merge branch 'docs-document-version-for-group-milestones-api' into 'master'Achilleas Pipinellis2017-08-252-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Document version Group Milestones API introduced See merge request !13787
| * | | | Document version Group Milestones API introducedMark Fletcher2017-08-242-0/+10
| | | | |
* | | | | Merge branch 'fix-deprecation-warning' into 'master'Clement Ho2017-08-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix deprecation warning when running webpack See merge request !13656
| * | | | | fix deprecation warning present during webpack compilesMike Greiling2017-08-251-1/+1
| | | | | |
* | | | | | Merge branch 'authentiq-docs' into 'master'Achilleas Pipinellis2017-08-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Point to /developers on docs/administration/authentiq.md See merge request !13710
| * | | | | | Point to /developers on docs/administration/authentiq.mdAlexandros Keramidas2017-08-211-1/+1
| | | | | | |
* | | | | | | Merge branch 'replace_spinach_search_code.feature' into 'master'Robert Speicher2017-08-256-61/+63
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'source/search_code.feature' spinach test with an rspec analog See merge request !13697
| * | | | | | | Replace 'source/search_code.feature' spinach test with an rspec analogblackst0ne2017-08-257-65/+63
| | | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceblackst0ne2017-08-24297-1144/+2005
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceblackst0ne2017-08-22158-2879/+2608
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceblackst0ne2017-08-182-1/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'blackst0ne2017-08-186223-88244/+226867
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add index on ci_runners.contacted_atblackst0ne2017-04-283-1/+25
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs-update-links-guideline' into 'master'Achilleas Pipinellis2017-08-252-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs update links guideline to inline links Closes gitlab-com/gitlab-docs#121 See merge request !13677
| * | | | | | | | | | | | Indexes GFM markdown guidedocs-update-links-guidelineMarcia Ramos2017-08-181-0/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | use inline links instead of referencedMarcia Ramos2017-08-181-7/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs-add-deprecation-note-build-vars' into 'master'Achilleas Pipinellis2017-08-251-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add deprecation note in renaming sections for CI_BUILD_* variables Closes #36973 See merge request !13801
| * | | | | | | | | | | | | Update README.mddocs-add-deprecation-note-build-varsFabio Busatto2017-08-241-0/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'bvl-fix-mysql-bare-repository-importer' into 'master'Sean McGivern2017-08-253-62/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle creating a nested group on MySQL correctly See merge request !13829
| * | | | | | | | | | | | | | Handle creating a nested group on MySQL correctlybvl-fix-mysql-bare-repository-importerBob Van Landuyt2017-08-253-62/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't support nested groups on MySQL, raise an error explaining that on import instead of trying anyway.
* | | | | | | | | | | | | | | Merge branch '35721-auth-style-confirmation' into 'master'Clement Ho2017-08-253-37/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Authorizations regarding OAuth - style confirmation Closes #35721 See merge request !13691
| * | | | | | | | | | | | | | Authorizations regarding OAuth - style confirmationJacopo2017-08-243-37/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the styling of OAuth authorization page in order to follow the styling structure described in #28849.
* | | | | | | | | | | | | | | Merge branch '31409-fix-group-and-project-search-for-anonymous-users' into ↵Kamil Trzciński2017-08-2510-32/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix group and project search for anonymous users Closes #31409 See merge request !13745
| * | | | | | | | | | | | | | | Refactor complicated API group finding rules into GroupsFinderNick Thomas2017-08-242-16/+32
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix group and project search for anonymous usersNick Thomas2017-08-248-15/+95
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Allow v4 API GET requests for groups to be unauthenticatedNick Thomas2017-08-231-4/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '35811-copy-link-note' into 'master'Tim Zallmann2017-08-255-12/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for copying permalink to notes via more actions dropdown Closes #35811 See merge request !13299
| * | | | | | | | | | | | | | | Add support for copying permalink to notes via more actions dropdownDimitrie Hoekstra2017-08-255-12/+92
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'backstage/gb/improve-stages-statuses-migration' into 'master'Kamil Trzciński2017-08-252-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust a range and a batch sizes in stages statuses migration Closes #36793 See merge request !13767
| * | | | | | | | | | | | | | | Decrease statuses batch size even more in a migrationGrzegorz Bizon2017-08-251-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Adjust a range and a size in stages statuses migrationbackstage/gb/improve-stages-statuses-migrationGrzegorz Bizon2017-08-232-7/+8
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '36860-deleted-user-fix' into 'master'Sean McGivern2017-08-255-12/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failure when issue author is nil See merge request !13807
| * | | | | | | | | | | | | | | | Fix failure when issue author is nilJarka Kadlecova2017-08-255-12/+35
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'docs-article-gitlab-on-azure-1' into 'master'Achilleas Pipinellis2017-08-251-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: update - fix headers See merge request !13819
| * | | | | | | | | | | | | | | | | Docs: update - fix headersMarcia Ramos2017-08-251-13/+13
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '36939-fix-find-blobs-by-path' into 'master'Sean McGivern2017-08-253-14/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix searching for files by path Closes #36939 See merge request !13798
| * | | | | | | | | | | | | | | | | Fix searching for files by pathNick Thomas2017-08-253-14/+48
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'remove-ci-api-leftovers' into 'master'Kamil Trzciński2017-08-251-14/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove leftover API helper for removed CI API See merge request !13804
| * | | | | | | | | | | | | | | | | | Remove leftover API helper for removed CI APIremove-ci-api-leftoversRobert Schilling2017-08-241-14/+0
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'revert-appearances-description-html-not-null' into 'master'Douwe Maan2017-08-254-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-allow appearances.description_html to be NULL Closes #36919 See merge request !13806
| * | | | | | | | | | | | | | | | | | | Re-allow appearances.description_html to be NULLrevert-appearances-description-html-not-nullYorick Peterse2017-08-244-3/+26
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This column isn't always set (e.g. when upgrading from older instances) and technically it could be NULL (e.g. when flushing the cache). Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36919