summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* squash policies: rename conditionrefactor/declarative-policyhttp://jneen.net/2017-06-121-1/+1
* add some extremely rough documentationhttp://jneen.net/2017-06-121-0/+116
* use subject scope in :id/usershttp://jneen.net/2017-06-121-1/+3
* convert the special-case Ability methods to use policieshttp://jneen.net/2017-06-121-34/+10
* convert all the policies to DeclarativePolicyhttp://jneen.net/2017-06-1228-644/+584
* update the specs to not require a set to be returnedhttp://jneen.net/2017-06-1211-269/+297
* add a new DeclarativePolicy frameworkhttp://jneen.net/2017-06-129-0/+920
* Merge branch 'dm-revert-mr-8427'Douwe Maan2017-06-0928-720/+24
|\
| * Revert 'New file from interface on existing branch'dm-revert-mr-8427Douwe Maan2017-06-0928-720/+24
* | Merge branch '32622-fix-markdown_preview_spec' into 'master'Robert Speicher2017-06-091-1/+2
|\ \
| * | Ensure wiki is created before we visit the Wiki page32622-fix-markdown_preview_specRémy Coutable2017-06-091-1/+2
* | | Merge branch '33457-features-project-source-markdown_render-feature-fails-on-...Rémy Coutable2017-06-091-0/+2
|\ \ \
| * | | Fix intermittent Spinach markdown render failure33457-features-project-source-markdown_render-feature-fails-on-masterSean McGivern2017-06-091-0/+2
* | | | Merge branch 'tc-link-to-commit-on-help-page' into 'master'Robert Speicher2017-06-094-3/+9
|\ \ \ \
| * | | | Make the revision on the `/help` page clickabletc-link-to-commit-on-help-pageToon Claes2017-06-094-3/+9
* | | | | Merge branch 'dturner/grammar' into 'master'Rémy Coutable2017-06-091-4/+4
|\ \ \ \ \
| * | | | | Improve the grammar of the API docsDavid Turner2017-06-011-4/+4
* | | | | | Merge branch 'patch-17' into 'master'Rémy Coutable2017-06-091-2/+1
|\ \ \ \ \ \
| * | | | | | Fix syntax error that breaks link to permissions document.Sascha Reynolds2017-06-091-2/+1
|/ / / / / /
* | | | | | Merge branch 'clarify-transferring-project' into 'master'Rémy Coutable2017-06-091-2/+3
|\ \ \ \ \ \
| * | | | | | Clarify transferring project, specify permissionsLauri Piisang2017-06-091-2/+3
* | | | | | | Merge branch 'patch-17' into 'master'Rémy Coutable2017-06-091-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Update google.mdKanchana Wickremasinghe2017-06-081-0/+15
* | | | | | | | Merge branch 'fix-triggered-builds' into 'master'Rémy Coutable2017-06-091-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Pass false to trigger if EE_PACKAGE not setfix-triggered-buildsBalasankar C2017-06-091-2/+7
* | | | | | | | | Merge branch 'add-note-renaming-moving-registry-container-user-docs' into 'ma...Marcia Ramos2017-06-091-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add note on moving or renaming registry repositoryadd-note-renaming-moving-registry-container-user-docsCindy Pallares 🦉2017-06-061-0/+8
* | | | | | | | | | Merge branch '33315-es6-findindex-support' into 'master'Tim Zallmann2017-06-091-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Add Array `findIndex` support33315-es6-findindex-supportkushalpandya2017-06-071-0/+1
* | | | | | | | | | Merge branch 'pat-msg-on-auth-failure' into 'master'Rémy Coutable2017-06-097-10/+74
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-077-10/+74
* | | | | | | | | | | Merge branch 'locales_fix' into 'master'Rémy Coutable2017-06-092-0/+39
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Add german translation for time_ago_in_wordsHannes Rosenögger2017-06-082-0/+39
* | | | | | | | | | | Merge branch '33467-remove-nicescroll' into 'master'Phil Hughes2017-06-093-48/+59
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove nicescroll from job traceFilipa Lacerda2017-06-093-48/+59
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'dashboard-milestone-tabs-loading-async' into 'master'Sean McGivern2017-06-098-8/+110
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-asyncPhil Hughes2017-06-098-8/+110
* | | | | | | | | | | | Merge branch '33381-display-issue-state-in-mr-widget-issue-links' into 'master'Sean McGivern2017-06-093-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Display issue state in issue links section of merge request widget33381-display-issue-state-in-mr-widget-issue-linksAdam Niedzielski2017-06-093-2/+28
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs-bootsnap' into 'master'Rémy Coutable2017-06-093-0/+17
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Add Bootsnap to all environments to reduce application startup timers-bootsnapRobert Speicher2017-06-083-0/+17
* | | | | | | | | | | Merge branch 'dm-blob-binaryness-change' into 'master'Sean McGivern2017-06-097-18/+64
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Detect if file that appears to be text in the first 1024 bytes is actually bi...dm-blob-binaryness-changeDouwe Maan2017-06-087-18/+64
* | | | | | | | | | | | Merge branch 'issuable-sidebar-edit-button-field-focus' into 'master'Filipa Lacerda2017-06-093-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed dropdown filter input not focusing after transitionissuable-sidebar-edit-button-field-focusPhil Hughes2017-06-083-4/+22
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '33466-jobs-navigation-menu' into 'master'Phil Hughes2017-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Highlight jobs menu when we are in jobs pageFilipa Lacerda2017-06-091-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'port-post-receive-changes' into 'master'Robert Speicher2017-06-082-37/+30
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Refactor PostReceive worker to limit merge conflictsport-post-receive-changesDouglas Barbosa Alexandre2017-06-052-37/+30
* | | | | | | | | | | Merge branch 'use-request-store-on-mr-controller-query-count-spec' into 'master'Douwe Maan2017-06-081-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |