Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch '24501-new-file-existing-branch' into 'master' | Sean McGivern | 2017-03-13 | 22 | -18/+710 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | New file from interface on existing branch | Jacopo | 2017-03-13 | 22 | -18/+710 | |
| |/ / / | ||||||
* | | | | Merge branch 'license-file-9-0' into 'master' | Robert Speicher | 2017-03-13 | 1 | -0/+945 | |
|\ \ \ \ | ||||||
| * | | | | Move licenses file under the vendor folderlicense-file-9-0 | DJ Mountney | 2017-03-12 | 1 | -0/+0 | |
| * | | | | Add the generated license.csv for 9.0 | DJ Mountney | 2017-03-08 | 1 | -0/+945 | |
* | | | | | Merge branch 'dz-blacklist--names' into 'master' | Douwe Maan | 2017-03-13 | 5 | -2/+155 | |
|\ \ \ \ \ | ||||||
| * | | | | | Reserve few project and nested group paths | Dmitriy Zaporozhets | 2017-03-13 | 5 | -2/+155 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge branch 'pages-0.4.0' into 'master' | Robert Speicher | 2017-03-13 | 2 | -1/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use GitLab Pages v0.4.0 | Nick Thomas | 2017-03-13 | 2 | -1/+5 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'workhorse-1.4.1' into 'master' | Sean McGivern | 2017-03-13 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use gitlab-workhorse 1.4.1 | Jacob Vosmaer | 2017-03-13 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge branch '27114-add-undo-to-todos-in-the-done-tab' into 'master' | Sean McGivern | 2017-03-13 | 4 | -127/+169 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add 'Undo' to Todos in the Done tab | Jacopo | 2017-03-10 | 4 | -127/+169 | |
* | | | | | | Merge branch 'feature/gb/gitlab-qa-integration-tests' into 'master' | Grzegorz Bizon | 2017-03-13 | 33 | -0/+897 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add GitLab QA CE strategy and simplify inflectorfeature/gb/gitlab-qa-integration-tests | Grzegorz Bizon | 2017-03-13 | 4 | -61/+35 | |
| * | | | | | | Fix user menu selector in GitLab QA test suite | Grzegorz Bizon | 2017-03-13 | 1 | -1/+1 | |
| * | | | | | | Do not use GITLAB_RELEASE env to define QA strategy | Grzegorz Bizon | 2017-03-13 | 3 | -34/+36 | |
| * | | | | | | Fix GitLab QA release inflector strategy | Grzegorz Bizon | 2017-03-09 | 2 | -1/+7 | |
| * | | | | | | Remove unused tags in GitLab QA feature specs | Grzegorz Bizon | 2017-03-09 | 5 | -8/+6 | |
| * | | | | | | Remove EE classes from GitLab QA merged into CE | Grzegorz Bizon | 2017-03-09 | 4 | -48/+3 | |
| * | | | | | | Fix using release inflector to define autoloads | Grzegorz Bizon | 2017-03-09 | 1 | -1/+3 | |
| * | | | | | | Implement GitLab QA release inflection strategy | Grzegorz Bizon | 2017-03-09 | 3 | -0/+110 | |
| * | | | | | | Add env var that describes QA release to Dockerfile | Grzegorz Bizon | 2017-03-09 | 1 | -0/+2 | |
| * | | | | | | Extend README.md for GitLab QA in `qa/` directory | Grzegorz Bizon | 2017-03-09 | 1 | -0/+13 | |
| * | | | | | | Fix Rubocop offense and remove QA Rubocop from deps | Grzegorz Bizon | 2017-03-09 | 2 | -2/+1 | |
| * | | | | | | Remove blank line from GitLab QA Dockerfile | Grzegorz Bizon | 2017-03-09 | 1 | -1/+0 | |
| * | | | | | | Extend README for GitLab QA files in `qa/` | Grzegorz Bizon | 2017-03-09 | 1 | -0/+3 | |
| * | | | | | | Remove legacy scripts for building docker images | Grzegorz Bizon | 2017-03-09 | 1 | -25/+0 | |
| * | | | | | | Add GitLab QA integrations tests to GitLab CE / EE | Grzegorz Bizon | 2017-03-09 | 33 | -0/+859 | |
* | | | | | | | Merge branch 'adam-backport-ee-1406' into 'master' | Douwe Maan | 2017-03-13 | 3 | -5/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Backport changes from gitlab-org/gitlab-ee!1406adam-backport-ee-1406 | Adam Niedzielski | 2017-03-13 | 3 | -5/+19 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'refresh-permissions-recent-users' into 'master' | Rémy Coutable | 2017-03-13 | 2 | -0/+23 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Trigger refreshing of permissions in a migrationrefresh-permissions-recent-users | Yorick Peterse | 2017-03-13 | 2 | -0/+23 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch '28385-27189-tech-debt-dropdown' into 'master' | Fatih Acet | 2017-03-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | |
| * | | | | | | | 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 | |
| * | | | | | | | 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 | |
| * | | | | | | | 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 | |
| * | | | | | | | protect git access through the policy infra | http://jneen.net/ | 2017-03-09 | 1 | -1/+1 |