summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Respect permissions when showing Failed JobsKamil Trzciński2018-05-064-12/+60
* Merge branch 'fix-runner-pages-errors' into 'master'Kamil Trzciński2018-05-062-2/+2
|\
| * Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pagesDylan Griffith2018-05-042-2/+2
* | Merge branch 'fix/ide-file-scroll-issue' into 'master'Phil Hughes2018-05-041-0/+1
|\ \
| * | fix Web IDE file tree scroll issuePaul Slaughter2018-05-041-0/+1
|/ /
* | Merge branch '44542-move-import-specific-attributes-out-of-the-project-model-...Douwe Maan2018-05-0439-114/+610
|\ \
| * | Backports every CE related change from ee-44542 to CETiago Botelho2018-05-0439-114/+610
* | | Merge branch '46049-import-export-import-is-broken-due-to-the-addition-of-a-c...Douwe Maan2018-05-043-1/+14
|\ \ \
| * | | fix missing spaceJames Lopez2018-05-041-1/+1
| * | | Add ci_cd_settings delete_all dependency on projectJames Lopez2018-05-043-1/+14
* | | | Merge branch 'dm-webhook-catch-blocked-url-exception' into 'master'Robert Speicher2018-05-043-2/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix typo in changelog entryDouwe Maan2018-05-041-1/+1
| * | | Ensure web hook 'blocked URL' errors are stored in as web hook logs and prope...Douwe Maan2018-05-043-2/+8
* | | | Merge branch 'bvl-enforce-terms' into 'master'Douwe Maan2018-05-0461-101/+1586
|\ \ \ \
| * | | | Reuses `InternalRedirect` when possibleBob Van Landuyt2018-05-044-10/+50
| * | | | Enforces terms in the web applicationBob Van Landuyt2018-05-0425-92/+734
| * | | | Allow a user to accept/decline termsBob Van Landuyt2018-05-0414-12/+307
| * | | | Add `accepted_terms` to usersBob Van Landuyt2018-05-042-0/+25
| * | | | Display terms to a userBob Van Landuyt2018-05-048-0/+135
| * | | | Make the user dropdown reusableBob Van Landuyt2018-05-047-25/+92
| * | | | Add model to track users accepting agreementsBob Van Landuyt2018-05-044-0/+56
| * | | | Store application wide termsBob Van Landuyt2018-05-0413-5/+174
| * | | | Add `Term` model to keep track of termsBob Van Landuyt2018-05-044-0/+46
| * | | | Add `enforce_terms` to `application_settings`Bob Van Landuyt2018-05-042-0/+10
* | | | | Merge branch 'docs-46056-documentation-wrong-link-for-prometheus-configuratio...Achilleas Pipinellis2018-05-041-1/+1
|\ \ \ \ \
| * | | | | AutoDevOps Docs fix invalid external linkMark Fletcher2018-05-041-1/+1
* | | | | | Merge branch '5869-rebase-before-checking-ce-branch-ce' into 'master'Rémy Coutable2018-05-041-0/+2
|\ \ \ \ \ \
| * | | | | | Ignore knapsack and rspec_flakyLin Jen-Shin2018-05-041-0/+2
* | | | | | | Merge branch 'ce-jej/group-saml-callback-flow' into 'master'Douwe Maan2018-05-042-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Backport IdentityLinker#failed? from GroupSaml callback flowJames Edwards-Jones2018-05-042-1/+5
* | | | | | | | Merge branch 'ash.mckenzie/fix-rails-sidekiq-rails-module-namespacing' into '...Douwe Maan2018-05-041-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Ensure we're using Rails, not Sidekiq::RailsAsh McKenzie2018-05-041-1/+1
* | | | | | | | Merge branch 'replace-commits-tests-with-rspec' into 'master'Rémy Coutable2018-05-044-297/+254
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Replace commits spinach tests with RSpec analogSemyon Pupkov2018-05-044-297/+254
| |/ / / / / /
* | | | | | | Merge branch 'gitaly-note-duplication' into 'master'Douwe Maan2018-05-041-0/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Update repository.rbKim Carlbäcker2018-05-041-1/+1
| * | | | | | Add note about rebase/squash duplication in GitalyKim Carlbäcker2018-05-041-1/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'inform-the-user-when-there-are-no-project-import-options-availa...Rémy Coutable2018-05-043-48/+61
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Move import project pane to a separate partialGeorge Tsiolis2018-05-042-48/+52
| * | | | | Inform the user when there are no project import options availableGeorge Tsiolis2018-05-042-0/+9
| | |/ / / | |/| | |
* | | | | Merge branch 'winh-vue-templates-docs' into 'master'Filipa Lacerda2018-05-041-2/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Clarify location of Vue templatesWinnie Hellmann2018-05-041-2/+6
| | |/ / | |/| |
* | | | Merge branch '36762-reconcile-project-templates-with-auto-devops' into 'master'Kamil Trzciński2018-05-045-3/+8
|\ \ \ \
| * | | | Resolve "Reconcile project templates with Auto DevOps"Fabio Busatto2018-05-045-3/+8
|/ / / /
* | | | Merge branch 'feature/runner-per-group' into 'master'Kamil Trzciński2018-05-0438-184/+1031
|\ \ \ \
| * | | | Make add_index_to_namespaces_runners_token migration reversibleDylan Griffith2018-05-041-1/+7
| * | | | Fix constants in backfill_runner_type_for_ci_runners_post_migrate.rbDylan Griffith2018-05-031-4/+4
| * | | | Use smallint for runner_type since its an enumDylan Griffith2018-05-032-2/+2
| * | | | Dont remove duplicates in Runner.owned_or_shared since its not necessaryDylan Griffith2018-05-031-1/+4
| * | | | Remove unnecessary disable transaction in add_ci_runner_namespacesDylan Griffith2018-05-031-2/+0
View Lorry Controller Status