| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Split to two commands, feedback:test-db-rollback | Lin Jen-Shin | 2017-03-14 | 1 | -1/+2 |
| | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9908#note_25331127 | ||||
| * | Use `remove_foreign_key :timelogs, name: '...'` | Lin Jen-Shin | 2017-03-14 | 1 | -9/+2 |
| | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9908#note_25324225 | ||||
| * | Drop the index only for postgresql, because | Lin Jen-Shin | 2017-03-14 | 1 | -1/+2 |
| | | | | | | | mysql cannot simply drop the index without dropping the corresponding foreign key, and we certainly don't want to drop the foreign key here. | ||||
| * | Disable rubocop for down method | Lin Jen-Shin | 2017-03-14 | 1 | -0/+1 |
| | | |||||
| * | Fix for postgresql | Lin Jen-Shin | 2017-03-14 | 4 | -4/+12 |
| | | |||||
| * | Add a test which would rollback db and migrate again | Lin Jen-Shin | 2017-03-14 | 9 | -7/+26 |
| | | | | | Closes #29106 | ||||
| * | Merge branch '28385-27189-tech-debt-dropdown' into 'master' | Fatih Acet | 2017-03-13 | 1 | -1/+1 |
| |\ | | | | | | | | | Simplify jQuery selector See merge request !9881 | ||||
| | * | Simplify selector28385-27189-tech-debt-dropdown | Filipa Lacerda | 2017-03-10 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'refactor/global-permissions-for-internal-users' into 'master' | Sean McGivern | 2017-03-13 | 21 | -65/+105 |
| |\ \ | | | | | | | | | | | | | Refactor/global permissions for internal users See merge request !9598 | ||||
| | * | | allow internal attributes to have a nil valuerefactor/global-permissions-for-internal-users | http://jneen.net/ | 2017-03-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | mark internal users in the admin panel | http://jneen.net/ | 2017-03-09 | 1 | -1/+3 |
| | | | | | | | | | | | | | and don't offer to impersonate them | ||||
| | * | | reverse the logic and use a clearer name | http://jneen.net/ | 2017-03-09 | 1 | -7/+7 |
| | | | | |||||
| | * | | get the logic right :X | http://jneen.net/ | 2017-03-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | add .internal and .non_internal scopes | http://jneen.net/ | 2017-03-09 | 1 | -1/+13 |
| | | | | |||||
| | * | | consolidate the error handling for #impersonate | http://jneen.net/ | 2017-03-09 | 1 | -9/+12 |
| | | | | |||||
| | * | | add a spec that the ghost user cannot log in | http://jneen.net/ | 2017-03-09 | 1 | -0/+12 |
| | | | | |||||
| | * | | spec the new behavior of .class_for | http://jneen.net/ | 2017-03-09 | 1 | -4/+6 |
| | | | | | | | | | | | | | and more robustly spec the ancestor behavior | ||||
| | * | | spec the behavior of nil subjects | http://jneen.net/ | 2017-03-09 | 1 | -0/+6 |
| | | | | |||||
| | * | | fix a brittle stub | http://jneen.net/ | 2017-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | true is neither nil nor a user and doesn't make sense as the return value of `current_user` | ||||
| | * | | use policies to protect sending email | http://jneen.net/ | 2017-03-09 | 2 | -1/+2 |
| | | | | |||||
| | * | | don't require ghost users to be blocked | http://jneen.net/ | 2017-03-09 | 2 | -23/+0 |
| | | | | |||||
| | * | | don't require passwords for internal users | http://jneen.net/ | 2017-03-09 | 1 | -1/+8 |
| | | | | | | | | | | | | | since they can't log in | ||||
| | * | | protect git access through the policy infra | http://jneen.net/ | 2017-03-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | protect internal users from impersonation | http://jneen.net/ | 2017-03-09 | 1 | -0/+4 |
| | | | | |||||
| | * | | use the policy stack to protect logins | http://jneen.net/ | 2017-03-09 | 4 | -7/+6 |
| | | | | |||||
| | * | | add User#internal? and some global permissions | http://jneen.net/ | 2017-03-09 | 2 | -1/+10 |
| | | | | |||||
| | * | | use a magic default :global symbol instead of nil | http://jneen.net/ | 2017-03-09 | 10 | -15/+21 |
| | | | | | | | | | | | | | to make sure we mean the global permissions | ||||
| * | | | Merge branch 'backport-cache-middleware-fix' into 'master' | Rémy Coutable | 2017-03-13 | 1 | -0/+24 |
| |\ \ \ | | | | | | | | | | | | | | | | | Backport cache middleware fix See merge request !9867 | ||||
| | * | | | Try out the monkey patch to fix the middlewarebackport-cache-middleware-fix | Lin Jen-Shin | 2017-03-11 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which isn't properly cleaning up whenever something is thrown, not raised. See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1402#note_25128108 | ||||
| * | | | | Merge branch '24137-issuable-permalink' into 'master' | Rémy Coutable | 2017-03-13 | 4 | -1/+43 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link issuable reference to itself in header Closes #24137 See merge request !9641 | ||||
| | * | | | | link issuable reference to itself in header | mhasbini | 2017-03-09 | 4 | -1/+43 |
| | | | | | | |||||
| * | | | | | Merge branch 'fix_updated_field_in_atom_files' into 'master' | Rémy Coutable | 2017-03-13 | 6 | -5/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix xml.updated field in rss/atom feeds Closes #19437 See merge request !9889 | ||||
| | * | | | | | Fix xml.updated field in rss/atom feeds | blackst0ne | 2017-03-12 | 6 | -5/+9 |
| | | | | | | | |||||
| * | | | | | | Merge branch '29189-discussion-button' into 'master' | Filipa Lacerda | 2017-03-13 | 3 | -15/+17 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of resolve discussion button Closes #29189 See merge request !9865 | ||||
| | * | | | | | | Fix alignment of resolve discussion button29189-discussion-button | Annabel Dunstone Gray | 2017-03-10 | 3 | -15/+17 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '29328-fix-transient-failure-in-model-user-spec' into 'master' | Rémy Coutable | 2017-03-13 | 2 | -2/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve transient failure in spec/models/user_spec.rb Closes #29328 See merge request !9892 | ||||
| | * | | | | | | | Resolve transient failure in spec/models/user_spec.rb | George Andrinopoulos | 2017-03-13 | 2 | -2/+7 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'mrchrisw-update-deploy-key' into 'master' | Filipa Lacerda | 2017-03-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent deploy key documentation in UI See merge request !9817 | ||||
| | * | | | | | | | Fix inconsistent deploy key documentation in UImrchrisw-update-deploy-key | Chris Wilson | 2017-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy keys were added with write access to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383 - We still state " Deploy keys allow read-only access to your repository." in the UI. This updates the deploy key UI information to reflect the docs https://docs.gitlab.com/ce/ssh/README.html#deploy-keys | ||||
| * | | | | | | | | Merge branch 'zj-update-templates' into 'master' | James Lopez | 2017-03-13 | 5 | -29/+29 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Update templates with new CI variables See merge request !9852 | ||||
| | * | | | | | | | Update templates with new CI variableszj-update-templates | Z.J. van de Weg | 2017-03-10 | 5 | -29/+29 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'fix/execute-inflections-initializer-early' into 'master' | DJ Mountney | 2017-03-11 | 1 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Execute inflections initializer earlier See merge request !9871 | ||||
| | * | | | | | | | Execute inflections initializer earlierfix/execute-inflections-initializer-early | Douglas Barbosa Alexandre | 2017-03-10 | 1 | -0/+0 |
| | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch '29046-fix-github-importer-open-prs' into 'master' | Douwe Maan | 2017-03-10 | 5 | -33/+105 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitHub Import deleting branches for open PRs from a fork Closes #29046 See merge request !9758 | ||||
| | * | | | | | | | Using guard clause and added more specs29046-fix-github-importer-open-prs | Gabriel Mazetto | 2017-03-10 | 4 | -58/+90 |
| | | | | | | | | | |||||
| | * | | | | | | | Changelog | Gabriel Mazetto | 2017-03-10 | 1 | -0/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix GitHub Import for open PRs from a fork | Gabriel Mazetto | 2017-03-10 | 3 | -1/+37 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'add-frequently-used-emojis-back-to-menu' into 'master' | Filipa Lacerda | 2017-03-10 | 3 | -23/+61 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Add frequently used emojis back to awards menu See merge request !9843 | ||||
| | * | | | | | | Add frequently used emojis back to awards menuadd-frequently-used-emojis-back-to-menu | Eric Eastwood | 2017-03-09 | 3 | -23/+61 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Thanks @filipa for the shout` | ||||
| * | | | | | | Merge branch 'fix-500-in-notes-polling' into 'master' | Rémy Coutable | 2017-03-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix notes polling failing after code changes Closes #29327 See merge request !9862 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |