summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update-button-style' into 'master' ldap_user_filter_updateAnnabel Dunstone Gray2016-11-282-43/+53
|\
| * 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 rows24149-nav-hovertauriedavis2016-11-281-33/+18
* | | Merge branch '24985-environments-spinner' into 'master' Fatih Acet2016-11-281-1/+1
|\ \ \
| * | | 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 snippet25026-authenticate-user-for-new-snippetRémy Coutable2016-11-284-4/+47
* | | | | Merge branch 'docs/styleguide-haml-help-links' into 'master' Achilleas Pipinellis2016-11-281-0/+71
|\ \ \ \ \
| * | | | | Add guidelines in doc linking with HAMLAchilleas Pipinellis2016-11-281-0/+71
| | |_|/ / | |/| | |
* | | | | Merge branch 'zen-mode-fixture' into 'master' Alfredo Sumaran2016-11-283-12/+9
|\ \ \ \ \
| * | | | | 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` polyadd-find-polyLuke "Jared" Bennett2016-11-254-31/+70
* | | | | | Merge branch 'dynamic-build-fixture' into 'master' Alfredo Sumaran2016-11-288-208/+187
|\ \ \ \ \ \
| * | | | | | 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 '24813-project-members-with-developer-access-can-no-longer-creat...Sean McGivern2016-11-284-30/+34
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 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
| * | | | | | Revert "Pass correct tag target to post-receive hook when creating tag via UI"Adam Niedzielski2016-11-282-32/+3
* | | | | | | Merge branch '24860-actionview-template-error-undefined-method-size-for-nil-n...Sean McGivern2016-11-286-7/+45
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | 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 duplicationsSemyon Pupkov2016-11-284-7/+42
* | | | | | | Merge branch 'rs-phantomjs-disable-images' into 'master' Rémy Coutable2016-11-282-2/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Pass `--load-images=no` to PhantomJS via Capybara/Poltergeistrs-phantomjs-disable-imagesRobert Speicher2016-11-282-2/+18
* | | | | | | Merge branch 'rs-project-security-spec-speed' into 'master' Rémy Coutable2016-11-284-765/+747
|\ \ \ \ \ \ \
| * | | | | | | Speed up Project security access specsRobert Speicher2016-11-284-765/+747
| |/ / / / / /
* | | | | | | Merge branch 'fix-dead-help-link' into 'master' Rémy Coutable2016-11-283-14/+30
|\ \ \ \ \ \ \
| * | | | | | | Check that both '/help' and '/help/' URLs have the same behaviourDavid Wagner2016-11-251-0/+24
| * | | | | | | Fix broken external links in help/index.htmlDavid Wagner2016-11-202-14/+6
* | | | | | | | Merge branch 'remove-relative-call-from-finder' into 'master' Rémy Coutable2016-11-281-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary require_relative calls from finderSemyon Pupkov2016-11-261-2/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '22253-move-lfshelper-methods-somewhere-else-than-app-helpers' i...Robert Speicher2016-11-286-54/+91
|\ \ \ \ \ \ \ \
| * | | | | | | | Move LfsHelper to a new LfsRequest concern22253-move-lfshelper-methods-somewhere-else-than-app-helpersRémy Coutable2016-11-236-54/+91
* | | | | | | | | Merge branch 'backport/groups-helper-refactor' into 'master' Douwe Maan2016-11-281-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 leaserefresh-authorizations-with-leaseYorick Peterse2016-11-2510-48/+84
* | | | | | | | | | | Merge branch 'events-cache-invalidation' into 'master' Douwe Maan2016-11-2820-132/+38
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Removed data-user-is view codeevents-cache-invalidationYorick Peterse2016-11-256-33/+25
| * | | | | | | | | | Remove event caching codeYorick Peterse2016-11-2315-99/+13
* | | | | | | | | | | Merge branch 'ux-guide-anchor-hover' into 'master' Achilleas Pipinellis2016-11-272-13/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ci skip] UX Guide: Anchor hover guidance include color changeux-guide-anchor-hoverawhildy2016-11-262-13/+5
|/ / / / / / / / / /
View Lorry Controller Status