Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | fix blob controller spec failure - updated not to use file-path-fix/blob-controller-spec | James Lopez | 2016-11-29 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch '24880-configurable-plaintext-emails' into 'master' | Sean McGivern | 2016-11-29 | 1 | -0/+34 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emails | Ruben Davila | 2016-11-28 | 1 | -0/+34 | |
* | | | | | | | | | | Merge branch 'zj-issue-search-slash-command' into 'master' | Kamil Trzciński | 2016-11-29 | 2 | -1/+47 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add issue search slash commandzj-issue-search-slash-command | Z.J. van de Weg | 2016-11-25 | 2 | -1/+47 | |
* | | | | | | | | | | Merge branch 'hide-project-variables' into 'master' | Fatih Acet | 2016-11-29 | 1 | -0/+25 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add spec for hiding variables and remove the need for ES6 Symbol | Stan Hu | 2016-11-24 | 1 | -0/+25 | |
* | | | | | | | | | | | Merge branch 'hoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emails' i... | Douwe Maan | 2016-11-29 | 2 | -3/+95 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix spec style | Sean McGivern | 2016-11-28 | 2 | -10/+5 | |
| * | | | | | | | | | | | Tidy up text emails | Sean McGivern | 2016-11-28 | 1 | -4/+4 | |
| * | | | | | | | | | | | Clean up rubocop complaint | hhoopes | 2016-11-25 | 1 | -1/+1 | |
| * | | | | | | | | | | | Add keyword arguments to truncated_diff method | hhoopes | 2016-11-25 | 2 | -9/+3 | |
| * | | | | | | | | | | | Change diff highlight/truncate for reusability | hhoopes | 2016-11-25 | 2 | -1/+104 | |
| * | | | | | | | | | | | Add new template to handle both commit & mr notes | hhoopes | 2016-11-25 | 1 | -17/+2 | |
| * | | | | | | | | | | | Add diff hunks to notification emails on MR | hhoopes | 2016-11-25 | 1 | -2/+17 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' | Douwe Maan | 2016-11-28 | 5 | -22/+84 | |
* | | | | | | | | | | | Merge branch 'jej-fix-missing-access-check-on-issues' into 'security' | Douwe Maan | 2016-11-28 | 10 | -10/+41 | |
* | | | | | | | | | | | Merge branch 'jej-22869' into 'security' | Douwe Maan | 2016-11-28 | 2 | -0/+94 | |
* | | | | | | | | | | | Merge branch 'zj-fix-label-creation-non-members' into 'security' | Douwe Maan | 2016-11-28 | 3 | -17/+26 | |
* | | | | | | | | | | | Merge branch '25026-authenticate-user-for-new-snippet' into 'master' | Sean McGivern | 2016-11-28 | 2 | -0/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Ensure user is authenticated to create a new snippet25026-authenticate-user-for-new-snippet | Rémy Coutable | 2016-11-28 | 2 | -0/+42 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'zen-mode-fixture' into 'master' | Alfredo Sumaran | 2016-11-28 | 2 | -12/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Replace static fixture for zen_mode_spec (!7686) | winniehell | 2016-11-23 | 2 | -12/+5 | |
* | | | | | | | | | | | Merge branch 'add-find-poly' into 'master' | Alfredo Sumaran | 2016-11-28 | 2 | -23/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add `.find` polyadd-find-poly | Luke "Jared" Bennett | 2016-11-25 | 2 | -23/+46 | |
* | | | | | | | | | | | Merge branch 'dynamic-build-fixture' into 'master' | Alfredo Sumaran | 2016-11-28 | 7 | -208/+183 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Prefer arrow functions in build_spec.js.es6 | winniehell | 2016-11-25 | 1 | -14/+14 | |
| * | | | | | | | | | | | Strip <link> tags from fixtures to ignore CSS | winniehell | 2016-11-25 | 1 | -0/+3 | |
| * | | | | | | | | | | | Explicitly name namespace and projects for frontend fixtures | winniehell | 2016-11-25 | 4 | -4/+6 | |
| * | | | | | | | | | | | Use Rails test host name for frontend fixtures | winniehell | 2016-11-25 | 4 | -14/+17 | |
| * | | | | | | | | | | | Remove unnecessary IIFE from build_spec | winniehell | 2016-11-25 | 1 | -143/+141 | |
| * | | | | | | | | | | | Adjust build_spec to match fixture | winniehell | 2016-11-25 | 1 | -9/+16 | |
| * | | | | | | | | | | | Create dynamic fixture for build_spec (!7589) | winniehell | 2016-11-25 | 3 | -72/+34 | |
* | | | | | | | | | | | | Merge branch '24813-project-members-with-developer-access-can-no-longer-creat... | Sean McGivern | 2016-11-28 | 1 | -18/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Pass tag SHA to post-receive hook when tag is created via UI24813-project-members-with-developer-access-can-no-longer-create-tags | Adam Niedzielski | 2016-11-28 | 1 | -0/+26 | |
| * | | | | | | | | | | | | Revert "Pass correct tag target to post-receive hook when creating tag via UI" | Adam Niedzielski | 2016-11-28 | 1 | -22/+0 | |
* | | | | | | | | | | | | | Merge branch '24860-actionview-template-error-undefined-method-size-for-nil-n... | Sean McGivern | 2016-11-28 | 1 | -0/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Prevent error when submitting a merge request and pipeline is not defined24860-actionview-template-error-undefined-method-size-for-nil-nilclass | Adam Niedzielski | 2016-11-28 | 1 | -0/+31 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'issuable_filters_present-refactor' into 'master' | Robert Speicher | 2016-11-28 | 1 | -0/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Refactor issuable_filters_present to reduce duplications | Semyon Pupkov | 2016-11-28 | 1 | -0/+21 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'rs-phantomjs-disable-images' into 'master' | Rémy Coutable | 2016-11-28 | 1 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Pass `--load-images=no` to PhantomJS via Capybara/Poltergeistrs-phantomjs-disable-images | Robert Speicher | 2016-11-28 | 1 | -1/+9 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'rs-project-security-spec-speed' into 'master' | Rémy Coutable | 2016-11-28 | 4 | -765/+747 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Speed up Project security access specs | Robert Speicher | 2016-11-28 | 4 | -765/+747 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'fix-dead-help-link' into 'master' | Rémy Coutable | 2016-11-28 | 2 | -11/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Check that both '/help' and '/help/' URLs have the same behaviour | David Wagner | 2016-11-25 | 1 | -0/+24 | |
| * | | | | | | | | | | Fix broken external links in help/index.html | David Wagner | 2016-11-20 | 1 | -11/+3 | |
* | | | | | | | | | | | Merge branch 'refresh-authorizations-with-lease' into 'master' | Douwe Maan | 2016-11-28 | 2 | -6/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Refresh project authorizations using a Redis leaserefresh-authorizations-with-lease | Yorick Peterse | 2016-11-25 | 2 | -6/+44 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'events-cache-invalidation' into 'master' | Douwe Maan | 2016-11-28 | 2 | -4/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | |