Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | squash policies: rename conditionrefactor/declarative-policy | http://jneen.net/ | 2017-06-12 | 1 | -1/+1 |
* | add some extremely rough documentation | http://jneen.net/ | 2017-06-12 | 1 | -0/+116 |
* | use subject scope in :id/users | http://jneen.net/ | 2017-06-12 | 1 | -1/+3 |
* | convert the special-case Ability methods to use policies | http://jneen.net/ | 2017-06-12 | 1 | -34/+10 |
* | convert all the policies to DeclarativePolicy | http://jneen.net/ | 2017-06-12 | 28 | -644/+584 |
* | update the specs to not require a set to be returned | http://jneen.net/ | 2017-06-12 | 11 | -269/+297 |
* | add a new DeclarativePolicy framework | http://jneen.net/ | 2017-06-12 | 9 | -0/+920 |
* | Merge branch 'dm-revert-mr-8427' | Douwe Maan | 2017-06-09 | 28 | -720/+24 |
|\ | |||||
| * | Revert 'New file from interface on existing branch'dm-revert-mr-8427 | Douwe Maan | 2017-06-09 | 28 | -720/+24 |
* | | Merge branch '32622-fix-markdown_preview_spec' into 'master' | Robert Speicher | 2017-06-09 | 1 | -1/+2 |
|\ \ | |||||
| * | | Ensure wiki is created before we visit the Wiki page32622-fix-markdown_preview_spec | Rémy Coutable | 2017-06-09 | 1 | -1/+2 |
* | | | Merge branch '33457-features-project-source-markdown_render-feature-fails-on-... | Rémy Coutable | 2017-06-09 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Fix intermittent Spinach markdown render failure33457-features-project-source-markdown_render-feature-fails-on-master | Sean McGivern | 2017-06-09 | 1 | -0/+2 |
* | | | | Merge branch 'tc-link-to-commit-on-help-page' into 'master' | Robert Speicher | 2017-06-09 | 4 | -3/+9 |
|\ \ \ \ | |||||
| * | | | | Make the revision on the `/help` page clickabletc-link-to-commit-on-help-page | Toon Claes | 2017-06-09 | 4 | -3/+9 |
* | | | | | Merge branch 'dturner/grammar' into 'master' | Rémy Coutable | 2017-06-09 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Improve the grammar of the API docs | David Turner | 2017-06-01 | 1 | -4/+4 |
* | | | | | | Merge branch 'patch-17' into 'master' | Rémy Coutable | 2017-06-09 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix syntax error that breaks link to permissions document. | Sascha Reynolds | 2017-06-09 | 1 | -2/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'clarify-transferring-project' into 'master' | Rémy Coutable | 2017-06-09 | 1 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Clarify transferring project, specify permissions | Lauri Piisang | 2017-06-09 | 1 | -2/+3 |
* | | | | | | | Merge branch 'patch-17' into 'master' | Rémy Coutable | 2017-06-09 | 1 | -0/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update google.md | Kanchana Wickremasinghe | 2017-06-08 | 1 | -0/+15 |
* | | | | | | | | Merge branch 'fix-triggered-builds' into 'master' | Rémy Coutable | 2017-06-09 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Pass false to trigger if EE_PACKAGE not setfix-triggered-builds | Balasankar C | 2017-06-09 | 1 | -2/+7 |
* | | | | | | | | | Merge branch 'add-note-renaming-moving-registry-container-user-docs' into 'ma... | Marcia Ramos | 2017-06-09 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add note on moving or renaming registry repositoryadd-note-renaming-moving-registry-container-user-docs | Cindy Pallares 🦉 | 2017-06-06 | 1 | -0/+8 |
* | | | | | | | | | | Merge branch '33315-es6-findindex-support' into 'master' | Tim Zallmann | 2017-06-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Add Array `findIndex` support33315-es6-findindex-support | kushalpandya | 2017-06-07 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'pat-msg-on-auth-failure' into 'master' | Rémy Coutable | 2017-06-09 | 7 | -10/+74 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Instruct user to use a personal access token for Git over HTTP | Robin Bobbitt | 2017-06-07 | 7 | -10/+74 |
* | | | | | | | | | | | Merge branch 'locales_fix' into 'master' | Rémy Coutable | 2017-06-09 | 2 | -0/+39 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add german translation for time_ago_in_words | Hannes Rosenögger | 2017-06-08 | 2 | -0/+39 |
* | | | | | | | | | | | Merge branch '33467-remove-nicescroll' into 'master' | Phil Hughes | 2017-06-09 | 3 | -48/+59 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove nicescroll from job trace | Filipa Lacerda | 2017-06-09 | 3 | -48/+59 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'dashboard-milestone-tabs-loading-async' into 'master' | Sean McGivern | 2017-06-09 | 8 | -8/+110 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-async | Phil Hughes | 2017-06-09 | 8 | -8/+110 |
* | | | | | | | | | | | | Merge branch '33381-display-issue-state-in-mr-widget-issue-links' into 'master' | Sean McGivern | 2017-06-09 | 3 | -2/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Display issue state in issue links section of merge request widget33381-display-issue-state-in-mr-widget-issue-links | Adam Niedzielski | 2017-06-09 | 3 | -2/+28 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'rs-bootsnap' into 'master' | Rémy Coutable | 2017-06-09 | 3 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add Bootsnap to all environments to reduce application startup timers-bootsnap | Robert Speicher | 2017-06-08 | 3 | -0/+17 |
* | | | | | | | | | | | Merge branch 'dm-blob-binaryness-change' into 'master' | Sean McGivern | 2017-06-09 | 7 | -18/+64 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Detect if file that appears to be text in the first 1024 bytes is actually bi...dm-blob-binaryness-change | Douwe Maan | 2017-06-08 | 7 | -18/+64 |
* | | | | | | | | | | | | Merge branch 'issuable-sidebar-edit-button-field-focus' into 'master' | Filipa Lacerda | 2017-06-09 | 3 | -4/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed dropdown filter input not focusing after transitionissuable-sidebar-edit-button-field-focus | Phil Hughes | 2017-06-08 | 3 | -4/+22 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '33466-jobs-navigation-menu' into 'master' | Phil Hughes | 2017-06-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Highlight jobs menu when we are in jobs page | Filipa Lacerda | 2017-06-09 | 1 | -1/+1 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'port-post-receive-changes' into 'master' | Robert Speicher | 2017-06-08 | 2 | -37/+30 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Refactor PostReceive worker to limit merge conflictsport-post-receive-changes | Douglas Barbosa Alexandre | 2017-06-05 | 2 | -37/+30 |
* | | | | | | | | | | | Merge branch 'use-request-store-on-mr-controller-query-count-spec' into 'master' | Douwe Maan | 2017-06-08 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | |