summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Merge branch 'zj-fix-label-creation-non-members' into 'security'Douwe Maan2016-11-289-82/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix label creation non members Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23416 See merge request !2006
| * | | | | | | | | Merge branch 'ldap_user_filter_update2' into 'master' [ci skip] Drew Blessing2016-11-281-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `memberOf` OID in LDAP `user_filter` docs While not technically invalid, it is not necessary to have the `memberOf` OID in the `user_filter`. It clutters things up and causes confusion for users so it's better if we remove it from the docs. See merge request !7809
| | * | | | | | | | | Remove `memberOf` OID in LDAP `user_filter` docs ldap_user_filter_update2Drew Blessing2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While not technically invalid, it is not necessary to have the `memberOf` OID in the `user_filter`. It clutters things up and causes confusion for users so it's better if we remove it from the docs.
| * | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqAlejandro Rodríguez2016-11-2814-52/+29
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Update CHANGELOG.md for 8.13.7Rémy Coutable2016-11-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | Update CHANGELOG.md for 8.14.1Alejandro Rodríguez2016-11-2814-52/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | Merge branch 'update-button-style' into 'master' ldap_user_filter_updateAnnabel Dunstone Gray2016-11-282-43/+53
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create secondary colors for buttons with SCSS functions [Proper] ## What does this MR do? * Removes the hardcoded values for button colors and generates them using the `darken` function * Adds a border color for outline buttons on hover, focus and active states * Adds darker colors for outline buttons in their active state ## Are there points in the code the reviewer needs to double check? Naming for new factor variables might not be good enough. ## Why was this MR needed? Increases visibility of alternate states as specified in #24145 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24145 See merge request !7797
| | * | | | | | | | | Add darker active state for outline buttons and new border colors.Chris Peressini2016-11-282-10/+16
| | | | | | | | | | |
| | * | | | | | | | | Create secondary colors with darken functionChris Peressini2016-11-281-34/+38
| | |/ / / / / / / /
| * | | | | | | | | Merge branch '24149-nav-hover' into 'master' Annabel Dunstone Gray2016-11-281-33/+18
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hover state to navigation rows ## What does this MR do? Adds hover states to navigations rows ## Screenshots (if relevant) ![Screen_Recording_2016-11-28_at_09.21_AM](/uploads/5d273f8bc53f46f9b55590f56f2287d8/Screen_Recording_2016-11-28_at_09.21_AM.gif) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24149 See merge request !7584
| | * | | | | | | | | Add hover state to navigation rows24149-nav-hovertauriedavis2016-11-281-33/+18
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch '24985-environments-spinner' into 'master' Fatih Acet2016-11-281-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds spinner class ## What does this MR do? Adds class to spinner icon to actually spin. ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24985 See merge request !7761
| | * | | | | | | | Adds spinner class24985-environments-spinnerFilipa Lacerda2016-11-251-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch '25026-authenticate-user-for-new-snippet' into 'master' Sean McGivern2016-11-284-4/+47
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure user is authenticated to create a new snippet Closes #25026 See merge request !7786
| | * | | | | | | | | Ensure user is authenticated to create a new snippet25026-authenticate-user-for-new-snippetRémy Coutable2016-11-284-4/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Merge branch 'docs/styleguide-haml-help-links' into 'master' Achilleas Pipinellis2016-11-281-0/+71
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add guidelines in doc linking with HAML ## What does this MR do? Add guidelines and examples of HAML links to the buil-in help GitLab exposes under /help. See merge request !7798
| | * | | | | | | | | | Add guidelines in doc linking with HAMLAchilleas Pipinellis2016-11-281-0/+71
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | Merge branch 'zen-mode-fixture' into 'master' Alfredo Sumaran2016-11-283-12/+9
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for zen_mode_spec ## What does this MR do? Replace `zen_mode.html.haml` for `zen_mode_spec.js` by already existing dynamically generated fixture. ## What are the relevant issue numbers? #24753 See merge request !7686
| | * | | | | | | | | | Replace static fixture for zen_mode_spec (!7686)winniehell2016-11-233-12/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'add-find-poly' into 'master' Alfredo Sumaran2016-11-284-31/+70
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `.find` poly ## What does this MR do? Adds `[].find()` poly ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7710
| | * | | | | | | | | | Add `.find` polyadd-find-polyLuke "Jared" Bennett2016-11-254-31/+70
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'dynamic-build-fixture' into 'master' Alfredo Sumaran2016-11-288-208/+187
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create dynamic fixture for build_spec ## What does this MR do? Replace `spec/javascripts/fixtures/build.html.haml` by a dynamically created fixture (using `rake teaspoon:fixtures`). ## Why was this MR needed? The existing fixture was not representing the real page. ## What are the relevant issue numbers? #24614 would have been avoided following !6059 See merge request !7589
| | * | | | | | | | | | | Prefer arrow functions in build_spec.js.es6winniehell2016-11-251-14/+14
| | | | | | | | | | | | |
| | * | | | | | | | | | | Strip <link> tags from fixtures to ignore CSSwinniehell2016-11-251-0/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Explicitly name namespace and projects for frontend fixtureswinniehell2016-11-254-4/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | Use Rails test host name for frontend fixtureswinniehell2016-11-254-14/+17
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove unnecessary IIFE from build_specwinniehell2016-11-251-143/+141
| | | | | | | | | | | | |
| | * | | | | | | | | | | Adjust build_spec to match fixturewinniehell2016-11-251-9/+16
| | | | | | | | | | | | |
| | * | | | | | | | | | | Create dynamic fixture for build_spec (!7589)winniehell2016-11-254-72/+38
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch ↵Sean McGivern2016-11-284-30/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24813-project-members-with-developer-access-can-no-longer-create-tags' into 'master' Create tag after running pre-hooks and pass updated SHA to post-hooks Closes #24813 See merge request !7700
| | * | | | | | | | | | | Pass tag SHA to post-receive hook when tag is created via UI24813-project-members-with-developer-access-can-no-longer-create-tagsAdam Niedzielski2016-11-284-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only know the tag SHA after we create the tag. This means that we pass a different value to the hooks that happen before creating the tag, and a different value to the hooks that happen after creating the tag. This is not an ideal situation, but it is a trade-off we decided to make. For discussion of the alternatives please refer to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7700#note_18982873 "pre-receive" and "update" hooks always get the SHA of the commit that the tag points to. "post-receive" gets the tag SHA if it is an annotated tag or the commit SHA if it is an lightweight tag. Currently we always create annotated tags if UI is used.
| | * | | | | | | | | | | Revert "Pass correct tag target to post-receive hook when creating tag via UI"Adam Niedzielski2016-11-282-32/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ae51774bc45d2e15ccc61b01a30d1b588f179f85.
| * | | | | | | | | | | | Merge branch ↵Sean McGivern2016-11-286-7/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24860-actionview-template-error-undefined-method-size-for-nil-nilclass' into 'master' Prevent error when submitting a merge request and pipeline is not defined Closes #24860 See merge request !7707
| | * | | | | | | | | | | Prevent error when submitting a merge request and pipeline is not defined24860-actionview-template-error-undefined-method-size-for-nil-nilclassAdam Niedzielski2016-11-286-7/+45
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch 'issuable_filters_present-refactor' into 'master' Robert Speicher2016-11-284-7/+42
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor issuable_filters_present to reduce duplications See https://gitlab.com/gitlab-org/gitlab-ce/issues/23546 See merge request !7776
| | * | | | | | | | | | | Refactor issuable_filters_present to reduce duplicationsSemyon Pupkov2016-11-284-7/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23546
| * | | | | | | | | | | | Merge branch 'rs-phantomjs-disable-images' into 'master' Rémy Coutable2016-11-282-2/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass `--load-images=no` to PhantomJS via Capybara/Poltergeist We were unintentionally hitting `gravatar.com` whenever a test that used Poltergeist was run. This was certainly wasting their resources and slowing down our tests even further, for no reason. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See merge request !7781
| | * | | | | | | | | | | Pass `--load-images=no` to PhantomJS via Capybara/Poltergeistrs-phantomjs-disable-imagesRobert Speicher2016-11-282-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were unintentionally hitting `gravatar.com` whenever a test that used Poltergeist was run. This was certainly wasting their resources and slowing down our tests even further, for no reason.
| * | | | | | | | | | | | Merge branch 'rs-project-security-spec-speed' into 'master' Rémy Coutable2016-11-284-765/+747
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up Project security access specs Prior, every single test was creating four `ProjectMember` objects, each of which created one `User` record, even though each test only used _one_ of those Users, if any. Now each test only creates the single user record it needs, if it needs one. This shaves minutes off of each spec file changed here. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See merge request !7779
| | * | | | | | | | | | | | Speed up Project security access specsRobert Speicher2016-11-284-765/+747
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, every single test was creating four `ProjectMember` objects, each of which created one `User` record, even though each test only used _one_ of those Users, if any. Now each test only creates the single user record it needs, if it needs one. This shaves minutes off of each spec file changed here.
| * | | | | | | | | | | | Merge branch 'fix-dead-help-link' into 'master' Rémy Coutable2016-11-283-14/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a broken link and avoid potential creation of future broken links on the help page. See merge request !7582
| | * | | | | | | | | | | | Check that both '/help' and '/help/' URLs have the same behaviourDavid Wagner2016-11-251-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The links in the help page may be modified. This new test checks that URLs in this page are absolute and do not depend on the presence of a trailing slash in the URL. Signed-off-by: David Wagner <david@marvid.fr>
| | * | | | | | | | | | | | Fix broken external links in help/index.htmlDavid Wagner2016-11-202-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An external link was recently added but was broken because 'https://gitlab.com/help/' was prepended to every link in the page. Since no link in the main help readme begins with "help" and since doing so wouldn't make sense, the substitution conditionaly prepending "help" can be simplified and reused. Signed-off-by: David Wagner <david@marvid.fr>
| * | | | | | | | | | | | | Merge branch 'remove-relative-call-from-finder' into 'master' Rémy Coutable2016-11-281-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary require_relative calls from finder Rails add all from app to autoload. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7601 See merge request !7768
| | * | | | | | | | | | | | | Remove unnecessary require_relative calls from finderSemyon Pupkov2016-11-261-2/+0
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch '22253-move-lfshelper-methods-somewhere-else-than-app-helpers' ↵Robert Speicher2016-11-286-54/+91
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' This moves methods from `LfsHelper` to a new `LfsRequest` concern and introduces a new `WorkhorseRequest` concern. Closes #22253 See merge request !7623
| | * | | | | | | | | | | | | Move LfsHelper to a new LfsRequest concern22253-move-lfshelper-methods-somewhere-else-than-app-helpersRémy Coutable2016-11-236-54/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also create a new WorkhorseRequest concern Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | Merge branch 'backport/groups-helper-refactor' into 'master' Douwe Maan2016-11-281-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport groups_helper refactor from gitlab-org/gitlab-ee!904 This is a simple backport from a change in `groups_helper.rb` introduced by gitlab-org/gitlab-ee!904, requested here: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/904#note_18894726 See merge request !7767
| | * | | | | | | | | | | | | | Backporting little groups_helper refactor from gitlab-org/gitlab-ee!904backport/groups-helper-refactorGabriel Mazetto2016-11-261-5/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'refresh-authorizations-with-lease' into 'master' Douwe Maan2016-11-2810-48/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refresh project authorizations using a Redis lease This MR changes `User#refresh_authorized_projects` so it uses a Redis lease instead of relying on serializable transactions. See the commit message(s) for more details. See merge request !7733