Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'pipeline-schedule-webpack' into 'master' | Filipa Lacerda | 2018-02-15 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Converted pipeline_schedules bundles into automatic webpack entriespipeline-schedule-webpack | Phil Hughes | 2018-02-15 | 2 | -2/+2 | |
* | | | | | | | | | Merge branch 'sh-fix-error-500-licensee' into 'master' | Douwe Maan | 2018-02-15 | 1 | -0/+12 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Simplify license generator error handling | Stan Hu | 2018-02-14 | 1 | -3/+2 | |
| * | | | | | | | | | Fix Error 500s loading repositories with no master branch | Stan Hu | 2018-02-14 | 1 | -0/+13 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'move-profile-to-rspec' into 'master' | Rémy Coutable | 2018-02-15 | 5 | -19/+231 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Move spinach profile tests to RSpec | Semyon Pupkov | 2018-02-15 | 5 | -19/+231 | |
* | | | | | | | | | | Merge branch 'ce-rc/move-more-ee-only-spec-files' into 'master' | Sean McGivern | 2018-02-15 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Port some changes from gitlab-ee!4532 back to CEce-rc/move-more-ee-only-spec-files | Rémy Coutable | 2018-02-14 | 2 | -4/+4 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Fixed user synced attributes metadata after removing current provider | Francisco Javier López | 2018-02-15 | 3 | -0/+45 | |
* | | | | | | | | | Merge branch 'jej/fix-slow-lfs-object-check' into 'master' | Douwe Maan | 2018-02-15 | 1 | -2/+17 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Only check LFS integrity for first branch in pushjej/fix-slow-lfs-object-check | James Edwards-Jones | 2018-02-15 | 1 | -2/+17 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Move spinach group milestones test to RSpec | Semyon Pupkov | 2018-02-15 | 1 | -37/+114 | |
* | | | | | | | | Merge branch 'group-search-members-rspec' into 'master' | Rémy Coutable | 2018-02-15 | 1 | -0/+29 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Move feature group members search test to RSpec | Semyon Pupkov | 2018-02-15 | 1 | -0/+29 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch '35530-teleporting-emoji-fix' into 'master' | Fatih Acet | 2018-02-15 | 1 | -1/+12 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | The emoji menu should not close when the search box is clicked | Jared Deckard | 2018-02-07 | 1 | -1/+12 | |
* | | | | | | | | | Merge branch '34130-null-pipes' into 'master' | Fatih Acet | 2018-02-15 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Prevent MR Widget error when no CI configured34130-null-pipes | Simon Knox | 2018-02-12 | 1 | -0/+9 | |
* | | | | | | | | | Merge branch 'mc/fix/project-variables-scope' into 'master' | Kamil Trzciński | 2018-02-14 | 3 | -2/+70 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | Improve validation message and add changelogmc/fix/project-variables-scope | Kamil Trzciński | 2018-02-14 | 1 | -1/+1 | |
| * | | | | | | | | Add more information in variable_duplicates validator error message | Matija Čupić | 2018-02-13 | 2 | -3/+3 | |
| * | | | | | | | | Add specs for VariableDuplicates validator | Matija Čupić | 2018-02-13 | 1 | -0/+67 | |
| * | | | | | | | | Extend variable JSON Schema with optional environment_scope | Matija Čupić | 2018-02-13 | 1 | -1/+2 | |
* | | | | | | | | | Merge branch 'fl-mr-widget-4' into 'master' | Tim Zallmann | 2018-02-14 | 2 | -21/+35 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Moves mr widget components into vue filesfl-mr-widget-4 | Filipa Lacerda | 2018-02-13 | 2 | -21/+35 | |
* | | | | | | | | | Merge branch '41722-track-gcp-billing-enabled-project-changes' into 'master' | Kamil Trzciński | 2018-02-14 | 2 | -7/+62 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Count all billing_state transitions with labels41722-track-gcp-billing-enabled-project-changes | Matija Čupić | 2018-02-12 | 1 | -4/+4 | |
| * | | | | | | | | | Fix GCP cluster feature spec | Matija Čupić | 2018-02-12 | 1 | -2/+2 | |
| * | | | | | | | | | Refactor CheckGcpProjectBillingWorker | Matija Čupić | 2018-02-12 | 1 | -12/+6 | |
| * | | | | | | | | | Use Prometheus counter instead of redis | Matija Čupić | 2018-02-12 | 1 | -9/+3 | |
| * | | | | | | | | | Add missing newline in CheckGcpProjectBillingWorker spec | Matija Čupić | 2018-02-12 | 1 | -0/+1 | |
| * | | | | | | | | | Add specs for billing_enabled change counter | Matija Čupić | 2018-02-12 | 1 | -0/+66 | |
* | | | | | | | | | | Merge branch '39885-ensure-users-cannot-create-environments-with-leading-slas... | Kamil Trzciński | 2018-02-14 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Ensure users can't create environments with leading or trailing slashes (Fixe...39885-ensure-users-cannot-create-environments-with-leading-slashes | Dylan Griffith | 2018-02-13 | 1 | -0/+5 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch '43240-external-tracker-issues-don-t-have-the-correct-closing-te... | Rémy Coutable | 2018-02-14 | 1 | -117/+55 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix closing issues text added to MRs for external issue trackers | Sean McGivern | 2018-02-14 | 1 | -117/+55 | |
* | | | | | | | | | | | Merge branch 'ce-port-ee-f531c07299' into 'master' | Sean McGivern | 2018-02-14 | 1 | -8/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix a too strict array-matching expectation | Rémy Coutable | 2018-02-14 | 1 | -8/+7 | |
* | | | | | | | | | | | | Merge branch 'mk-fix-pg-undefined-table-ci-errors' into 'master' | Rémy Coutable | 2018-02-14 | 4 | -29/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Avoid dropping tables in test | Michael Kozono | 2018-02-14 | 4 | -29/+10 | |
* | | | | | | | | | | | | | Merge branch '42800-change-usage-of-avatar_icon' into 'master' | Yorick Peterse | 2018-02-14 | 3 | -14/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Extract repeated logic into #avatar_icon_for.42800-change-usage-of-avatar_icon | Andreas Brandl | 2018-02-13 | 1 | -0/+16 | |
| * | | | | | | | | | | | | | Remove generic #avatar_icon helper. | Andreas Brandl | 2018-02-13 | 1 | -28/+0 | |
| * | | | | | | | | | | | | | Explicit use of avatar_icon_* calls depending on situation. | Andreas Brandl | 2018-02-13 | 1 | -8/+8 | |
| * | | | | | | | | | | | | | Use more specific #avatar_icon_for_user. | Andreas Brandl | 2018-02-13 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Refactor and split ApplicationHelper#avatar_icon. | Andreas Brandl | 2018-02-13 | 1 | -0/+48 | |
* | | | | | | | | | | | | | | Merge branch 'expired-ci-artifacts' into 'master' | Grzegorz Bizon | 2018-02-14 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Add indexes and change SQL for expired artifacts to deal with artifacts migra... | Greg Stark | 2018-02-08 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'fix/template-project-visibility' into 'master' | Douwe Maan | 2018-02-14 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |