summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix regression in runners registration v1 apifix/regression-in-runners-registration-v1-apiTomasz Maczukin2017-03-133-2/+8
* Merge branch '27114-add-undo-to-todos-in-the-done-tab' into 'master' Sean McGivern2017-03-134-127/+169
|\
| * Add 'Undo' to Todos in the Done tabJacopo2017-03-104-127/+169
* | Merge branch 'feature/gb/gitlab-qa-integration-tests' into 'master' Grzegorz Bizon2017-03-1333-0/+897
|\ \
| * | Add GitLab QA CE strategy and simplify inflectorfeature/gb/gitlab-qa-integration-testsGrzegorz Bizon2017-03-134-61/+35
| * | Fix user menu selector in GitLab QA test suiteGrzegorz Bizon2017-03-131-1/+1
| * | Do not use GITLAB_RELEASE env to define QA strategyGrzegorz Bizon2017-03-133-34/+36
| * | Fix GitLab QA release inflector strategyGrzegorz Bizon2017-03-092-1/+7
| * | Remove unused tags in GitLab QA feature specsGrzegorz Bizon2017-03-095-8/+6
| * | Remove EE classes from GitLab QA merged into CEGrzegorz Bizon2017-03-094-48/+3
| * | Fix using release inflector to define autoloadsGrzegorz Bizon2017-03-091-1/+3
| * | Implement GitLab QA release inflection strategyGrzegorz Bizon2017-03-093-0/+110
| * | Add env var that describes QA release to DockerfileGrzegorz Bizon2017-03-091-0/+2
| * | Extend README.md for GitLab QA in `qa/` directoryGrzegorz Bizon2017-03-091-0/+13
| * | Fix Rubocop offense and remove QA Rubocop from depsGrzegorz Bizon2017-03-092-2/+1
| * | Remove blank line from GitLab QA DockerfileGrzegorz Bizon2017-03-091-1/+0
| * | Extend README for GitLab QA files in `qa/`Grzegorz Bizon2017-03-091-0/+3
| * | Remove legacy scripts for building docker imagesGrzegorz Bizon2017-03-091-25/+0
| * | Add GitLab QA integrations tests to GitLab CE / EEGrzegorz Bizon2017-03-0933-0/+859
* | | Merge branch 'adam-backport-ee-1406' into 'master' Douwe Maan2017-03-133-5/+19
|\ \ \
| * | | Backport changes from gitlab-org/gitlab-ee!1406adam-backport-ee-1406Adam Niedzielski2017-03-133-5/+19
* | | | Merge branch 'refresh-permissions-recent-users' into 'master' Rémy Coutable2017-03-132-0/+23
|\ \ \ \ | |/ / / |/| | |
| * | | Trigger refreshing of permissions in a migrationrefresh-permissions-recent-usersYorick Peterse2017-03-132-0/+23
|/ / /
* | | 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