summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport changes from gitlab-org/gitlab-ee!1406adam-backport-ee-1406Adam Niedzielski2017-03-133-5/+19
* Merge branch '28385-27189-tech-debt-dropdown' into 'master' Fatih Acet2017-03-131-1/+1
|\
| * Simplify selector28385-27189-tech-debt-dropdownFilipa Lacerda2017-03-101-1/+1
* | Merge branch 'refactor/global-permissions-for-internal-users' into 'master' Sean McGivern2017-03-1321-65/+105
|\ \
| * | allow internal attributes to have a nil valuerefactor/global-permissions-for-internal-usershttp://jneen.net/2017-03-101-1/+1
| * | mark internal users in the admin panelhttp://jneen.net/2017-03-091-1/+3
| * | reverse the logic and use a clearer namehttp://jneen.net/2017-03-091-7/+7
| * | get the logic right :Xhttp://jneen.net/2017-03-091-1/+1
| * | add .internal and .non_internal scopeshttp://jneen.net/2017-03-091-1/+13
| * | consolidate the error handling for #impersonatehttp://jneen.net/2017-03-091-9/+12
| * | add a spec that the ghost user cannot log inhttp://jneen.net/2017-03-091-0/+12
| * | spec the new behavior of .class_forhttp://jneen.net/2017-03-091-4/+6
| * | spec the behavior of nil subjectshttp://jneen.net/2017-03-091-0/+6
| * | fix a brittle stubhttp://jneen.net/2017-03-091-1/+1
| * | use policies to protect sending emailhttp://jneen.net/2017-03-092-1/+2
| * | don't require ghost users to be blockedhttp://jneen.net/2017-03-092-23/+0
| * | don't require passwords for internal usershttp://jneen.net/2017-03-091-1/+8
| * | protect git access through the policy infrahttp://jneen.net/2017-03-091-1/+1
| * | protect internal users from impersonationhttp://jneen.net/2017-03-091-0/+4
| * | use the policy stack to protect loginshttp://jneen.net/2017-03-094-7/+6
| * | add User#internal? and some global permissionshttp://jneen.net/2017-03-092-1/+10
| * | use a magic default :global symbol instead of nilhttp://jneen.net/2017-03-0910-15/+21
* | | Merge branch 'backport-cache-middleware-fix' into 'master' Rémy Coutable2017-03-131-0/+24
|\ \ \
| * | | Try out the monkey patch to fix the middlewarebackport-cache-middleware-fixLin Jen-Shin2017-03-111-0/+24
* | | | Merge branch '24137-issuable-permalink' into 'master' Rémy Coutable2017-03-134-1/+43
|\ \ \ \
| * | | | link issuable reference to itself in headermhasbini2017-03-094-1/+43
* | | | | Merge branch 'fix_updated_field_in_atom_files' into 'master' Rémy Coutable2017-03-136-5/+9
|\ \ \ \ \
| * | | | | Fix xml.updated field in rss/atom feedsblackst0ne2017-03-126-5/+9
* | | | | | Merge branch '29189-discussion-button' into 'master' Filipa Lacerda2017-03-133-15/+17
|\ \ \ \ \ \
| * | | | | | Fix alignment of resolve discussion button29189-discussion-buttonAnnabel Dunstone Gray2017-03-103-15/+17
* | | | | | | Merge branch '29328-fix-transient-failure-in-model-user-spec' into 'master' Rémy Coutable2017-03-132-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Resolve transient failure in spec/models/user_spec.rbGeorge Andrinopoulos2017-03-132-2/+7
|/ / / / / / /
* | | | | | | Merge branch 'mrchrisw-update-deploy-key' into 'master' Filipa Lacerda2017-03-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix inconsistent deploy key documentation in UImrchrisw-update-deploy-keyChris Wilson2017-03-081-1/+1
* | | | | | | | Merge branch 'zj-update-templates' into 'master' James Lopez2017-03-135-29/+29
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Update templates with new CI variableszj-update-templatesZ.J. van de Weg2017-03-105-29/+29
* | | | | | | | Merge branch 'fix/execute-inflections-initializer-early' into 'master' DJ Mountney2017-03-111-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Execute inflections initializer earlierfix/execute-inflections-initializer-earlyDouglas Barbosa Alexandre2017-03-101-0/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '29046-fix-github-importer-open-prs' into 'master' Douwe Maan2017-03-105-33/+105
|\ \ \ \ \ \ \
| * | | | | | | Using guard clause and added more specs29046-fix-github-importer-open-prsGabriel Mazetto2017-03-104-58/+90
| * | | | | | | ChangelogGabriel Mazetto2017-03-101-0/+4
| * | | | | | | Fix GitHub Import for open PRs from a forkGabriel Mazetto2017-03-103-1/+37
| |/ / / / / /
* | | | | | | Merge branch 'add-frequently-used-emojis-back-to-menu' into 'master' Filipa Lacerda2017-03-103-23/+61
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add frequently used emojis back to awards menuadd-frequently-used-emojis-back-to-menuEric Eastwood2017-03-093-23/+61
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix-500-in-notes-polling' into 'master' Rémy Coutable2017-03-101-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix notes polling failing after code changesSean McGivern2017-03-101-1/+1
* | | | | | Merge branch '29263-merge-button-color' into 'master' 29326-how-to-vue-architectural-decisionsAnnabel Dunstone Gray2017-03-103-5/+5
|\ \ \ \ \ \
| * | | | | | Consistent button colors for disabled buttons29263-merge-button-colorSimon Knox2017-03-103-5/+5
* | | | | | | Merge branch '29137-bulk-perform-async-should-specify-queue' into 'master' Douwe Maan2017-03-103-6/+25
|\ \ \ \ \ \ \
| * | | | | | | adds queue option to push bulk in authorized projects worker29137-bulk-perform-async-should-specify-queueTiago Botelho2017-03-103-6/+25
| | |_|/ / / / | |/| | | | |
View Lorry Controller Status