summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/blob-controller-spec' into 'master' Sean McGivern2016-11-291-1/+1
|\
| * fix blob controller spec failure - updated not to use file-path-fix/blob-controller-specJames Lopez2016-11-291-1/+1
* | Merge branch '24880-configurable-plaintext-emails' into 'master' Sean McGivern2016-11-291-0/+34
|\ \
| * | Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-281-0/+34
* | | Merge branch 'zj-issue-search-slash-command' into 'master' Kamil Trzciński2016-11-292-1/+47
|\ \ \ | |_|/ |/| |
| * | Add issue search slash commandzj-issue-search-slash-commandZ.J. van de Weg2016-11-252-1/+47
* | | Merge branch 'hide-project-variables' into 'master' Fatih Acet2016-11-291-0/+25
|\ \ \
| * | | Add spec for hiding variables and remove the need for ES6 SymbolStan Hu2016-11-241-0/+25
* | | | Merge branch 'hoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emails' i...Douwe Maan2016-11-292-3/+95
|\ \ \ \
| * | | | Fix spec styleSean McGivern2016-11-282-10/+5
| * | | | Tidy up text emailsSean McGivern2016-11-281-4/+4
| * | | | Clean up rubocop complainthhoopes2016-11-251-1/+1
| * | | | Add keyword arguments to truncated_diff methodhhoopes2016-11-252-9/+3
| * | | | Change diff highlight/truncate for reusabilityhhoopes2016-11-252-1/+104
| * | | | Add new template to handle both commit & mr noteshhoopes2016-11-251-17/+2
| * | | | Add diff hunks to notification emails on MRhhoopes2016-11-251-2/+17
* | | | | Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' Douwe Maan2016-11-285-22/+84
* | | | | Merge branch 'jej-fix-missing-access-check-on-issues' into 'security'Douwe Maan2016-11-2810-10/+41
* | | | | Merge branch 'jej-22869' into 'security'Douwe Maan2016-11-282-0/+94
* | | | | Merge branch 'zj-fix-label-creation-non-members' into 'security'Douwe Maan2016-11-283-17/+26
* | | | | Merge branch '25026-authenticate-user-for-new-snippet' into 'master' Sean McGivern2016-11-282-0/+42
|\ \ \ \ \
| * | | | | Ensure user is authenticated to create a new snippet25026-authenticate-user-for-new-snippetRémy Coutable2016-11-282-0/+42
* | | | | | Merge branch 'zen-mode-fixture' into 'master' Alfredo Sumaran2016-11-282-12/+5
|\ \ \ \ \ \
| * | | | | | Replace static fixture for zen_mode_spec (!7686)winniehell2016-11-232-12/+5
* | | | | | | Merge branch 'add-find-poly' into 'master' Alfredo Sumaran2016-11-282-23/+46
|\ \ \ \ \ \ \
| * | | | | | | Add `.find` polyadd-find-polyLuke "Jared" Bennett2016-11-252-23/+46
* | | | | | | | Merge branch 'dynamic-build-fixture' into 'master' Alfredo Sumaran2016-11-287-208/+183
|\ \ \ \ \ \ \ \
| * | | | | | | | 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-253-72/+34
* | | | | | | | | Merge branch '24813-project-members-with-developer-access-can-no-longer-creat...Sean McGivern2016-11-281-18/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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-281-0/+26
| * | | | | | | | | Revert "Pass correct tag target to post-receive hook when creating tag via UI"Adam Niedzielski2016-11-281-22/+0
* | | | | | | | | | Merge branch '24860-actionview-template-error-undefined-method-size-for-nil-n...Sean McGivern2016-11-281-0/+31
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Prevent error when submitting a merge request and pipeline is not defined24860-actionview-template-error-undefined-method-size-for-nil-nilclassAdam Niedzielski2016-11-281-0/+31
| |/ / / / / / / /
* | | | | | | | | Merge branch 'issuable_filters_present-refactor' into 'master' Robert Speicher2016-11-281-0/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor issuable_filters_present to reduce duplicationsSemyon Pupkov2016-11-281-0/+21
* | | | | | | | | | Merge branch 'rs-phantomjs-disable-images' into 'master' Rémy Coutable2016-11-281-1/+9
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Pass `--load-images=no` to PhantomJS via Capybara/Poltergeistrs-phantomjs-disable-imagesRobert Speicher2016-11-281-1/+9
| |/ / / / / / / /
* | | | | | | | | 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-282-11/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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-201-11/+3
* | | | | | | | | | Merge branch 'refresh-authorizations-with-lease' into 'master' Douwe Maan2016-11-282-6/+44
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refresh project authorizations using a Redis leaserefresh-authorizations-with-leaseYorick Peterse2016-11-252-6/+44
View Lorry Controller Status