summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emails' i...Douwe Maan2016-11-2913-32/+55
|\
| * Use assigned variables betterhoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emailsSean McGivern2016-11-282-5/+3
| * Don't use diff_line_content for emailsSean McGivern2016-11-282-4/+2
| * Don't remove + / - signs from diff emailsSean McGivern2016-11-282-2/+4
| * Tidy up text emailsSean McGivern2016-11-285-10/+9
| * Add keyword arguments to truncated_diff methodhhoopes2016-11-2510-37/+33
| * Change diff highlight/truncate for reusabilityhhoopes2016-11-258-18/+25
| * Add new template to handle both commit & mr noteshhoopes2016-11-256-23/+38
| * Add diff hunks to notification emails on MRhhoopes2016-11-253-1/+9
* | Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' Douwe Maan2016-11-285-6/+6
* | Merge branch 'jej-fix-missing-access-check-on-issues' into 'security'Douwe Maan2016-11-286-13/+17
* | Merge branch 'jej-22869' into 'security'Douwe Maan2016-11-283-14/+10
* | Merge branch 'zj-fix-label-creation-non-members' into 'security'Douwe Maan2016-11-282-4/+11
* | 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-281-4/+1
|\ \ \ \
| * | | | Ensure user is authenticated to create a new snippet25026-authenticate-user-for-new-snippetRémy Coutable2016-11-281-4/+1
* | | | | Merge branch 'add-find-poly' into 'master' Alfredo Sumaran2016-11-282-8/+24
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add `.find` polyadd-find-polyLuke "Jared" Bennett2016-11-252-8/+24
| | |/ / | |/| |
* | | | Merge branch '24813-project-members-with-developer-access-can-no-longer-creat...Sean McGivern2016-11-282-12/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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-282-4/+7
| * | | Revert "Pass correct tag target to post-receive hook when creating tag via UI"Adam Niedzielski2016-11-281-10/+3
* | | | Merge branch '24860-actionview-template-error-undefined-method-size-for-nil-n...Sean McGivern2016-11-284-7/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Prevent error when submitting a merge request and pipeline is not defined24860-actionview-template-error-undefined-method-size-for-nil-nilclassAdam Niedzielski2016-11-284-7/+10
| |/ /
* | | Merge branch 'issuable_filters_present-refactor' into 'master' Robert Speicher2016-11-282-7/+17
|\ \ \ | |/ / |/| |
| * | Refactor issuable_filters_present to reduce duplicationsSemyon Pupkov2016-11-282-7/+17
* | | Merge branch 'fix-dead-help-link' into 'master' Rémy Coutable2016-11-281-3/+3
|\ \ \
| * | | Fix broken external links in help/index.htmlDavid Wagner2016-11-201-3/+3
* | | | 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-282-23/+36
|\ \ \ \ \
| * | | | | Refresh project authorizations using a Redis leaserefresh-authorizations-with-leaseYorick Peterse2016-11-252-23/+36
* | | | | | Merge branch 'events-cache-invalidation' into 'master' Douwe Maan2016-11-2817-128/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Removed data-user-is view codeevents-cache-invalidationYorick Peterse2016-11-254-29/+7
| * | | | | Remove event caching codeYorick Peterse2016-11-2314-99/+9
* | | | | | Merge branch '24903-allow-groups-with-special-characters' into 'master' Alfredo Sumaran2016-11-251-2/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | use standard gitlab namespace regex for group name validationMike Greiling2016-11-251-2/+3
| * | | | | allow "." in group name validation regex24903-allow-groups-with-special-charactersMike Greiling2016-11-231-1/+1
* | | | | | Merge branch 'fix-cancelling-pipelines' into 'master' Kamil Trzciński2016-11-252-8/+17
|\ \ \ \ \ \
| * | | | | | Wrap against 80 chars and rename failed_or_canceledfix-cancelling-pipelinesLin Jen-Shin2016-11-231-7/+9
| * | | | | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-2287-684/+2167
| |\ \ \ \ \ \
View Lorry Controller Status