Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'i18n-extract-app/views/doorkeeper' into 'master' | Rémy Coutable | 2018-07-16 | 13 | -61/+163 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | i18n: externalize strings from 'app/views/doorkeeper' | Tao Wang | 2018-07-13 | 13 | -61/+163 | |
* | | | | | | | | | | | Merge branch 'set-build-token-CN' into 'master' | Rémy Coutable | 2018-07-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add the CI Job trigger as the build triggerset-build-token-CN | DJ Mountney | 2018-07-13 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'mk/fix-flaky-protected-branch-expectations' into 'master' | Rémy Coutable | 2018-07-16 | 5 | -44/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove flaky and redundant expectationsmk/fix-flaky-protected-branch-expectations | Michael Kozono | 2018-07-13 | 5 | -44/+3 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'jprovazn-rails-ci' into 'master' | Rémy Coutable | 2018-07-16 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Trigger rails5 tests either by variable or ref namejprovazn-rails-ci | Jan Provaznik | 2018-07-16 | 1 | -1/+3 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'sh-allow-danger-to-fail' into 'master' | Rémy Coutable | 2018-07-16 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Allow Danger step to failsh-allow-danger-to-fail | Stan Hu | 2018-07-14 | 1 | -0/+1 | |
* | | | | | | | | | | | | Merge branch 'fix-danger' into 'master' | Rémy Coutable | 2018-07-16 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Use the correct exceptions to look for invalid YAML in Changelogsfix-danger | Gabriel Mazetto | 2018-07-13 | 1 | -2/+4 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch '49262-fix-autodevops-link-to-default-chart-docs' into 'master' | Kamil Trzciński | 2018-07-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix link in help doc which was linking to old mono-repo, now in its own repo49262-fix-autodevops-link-to-default-chart-docs | Thong Kuah | 2018-07-16 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'upgrade-frontend-deps' into 'master' | Fatih Acet | 2018-07-14 | 2 | -965/+395 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | update webpack to v4.16 | Mike Greiling | 2018-07-14 | 2 | -965/+395 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch '49128-improve-log-output-of-jasmine-toequal' into 'master' | Mike Greiling | 2018-07-13 | 3 | -2/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | improve log output of jasmine `toEqual` with nested objects/arrays49128-improve-log-output-of-jasmine-toequal | Lukas Eipert | 2018-07-11 | 3 | -2/+18 | |
* | | | | | | | | | | | | Merge branch 'sh-backport-ee-logger-changes' into 'master' | Douglas Barbosa Alexandre | 2018-07-13 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Backport logger changes from EE | Stan Hu | 2018-07-13 | 1 | -0/+8 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '48673-lazy-load-performance-bar-in-frontend' into 'master' | Mike Greiling | 2018-07-13 | 4 | -89/+115 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Lazy-load performance bar UI48673-lazy-load-performance-bar-in-frontend | Sean McGivern | 2018-07-13 | 4 | -89/+115 | |
* | | | | | | | | | | | Merge branch 'ide-merge-requests-forks' into 'master' | Filipa Lacerda | 2018-07-13 | 12 | -20/+161 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fixed test to correctly text relative URLside-merge-requests-forks | Phil Hughes | 2018-07-13 | 2 | -13/+32 | |
| * | | | | | | | | | | | fixed karma specs | Phil Hughes | 2018-07-12 | 1 | -2/+9 | |
| * | | | | | | | | | | | Allow collaboration with forks through the API | Bob Van Landuyt | 2018-07-12 | 3 | -4/+81 | |
| * | | | | | | | | | | | Allow merge requests from forks to be opened in Web IDE | Phil Hughes | 2018-07-12 | 8 | -10/+48 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'fix/gb/fix-project-settings-build-time-validation' into 'master' | Kamil Trzciński | 2018-07-13 | 3 | -8/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add changelog for maximum build timeout validationfix/gb/fix-project-settings-build-time-validation | Grzegorz Bizon | 2018-07-12 | 1 | -0/+5 | |
| * | | | | | | | | | | | Improve project build time setting validation | Grzegorz Bizon | 2018-07-12 | 2 | -8/+12 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch '48894-fix-rss-button-interaction' into 'master' | Annabel Gray | 2018-07-13 | 6 | -5/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add changelog entry48894-fix-rss-button-interaction | Kushal Pandya | 2018-07-13 | 1 | -0/+5 | |
| * | | | | | | | | | | | Fix RSS button interaction on Dashboard, Project and Group activities | Kushal Pandya | 2018-07-13 | 1 | -0/+7 | |
| * | | | | | | | | | | | Add flex to tabs container | Kushal Pandya | 2018-07-13 | 1 | -1/+1 | |
| * | | | | | | | | | | | Update `.controls` positioning | Kushal Pandya | 2018-07-13 | 3 | -4/+3 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'sh-fix-stderr-pipe-consumption' into 'master' | Yorick Peterse | 2018-07-13 | 5 | -7/+68 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Avoid process deadlock in popen by consuming input pipessh-fix-stderr-pipe-consumption | Stan Hu | 2018-07-12 | 5 | -7/+68 | |
* | | | | | | | | | | | | Merge branch 'fix/gb/add-missing-before-sha-predefined-variable' into 'master' | Kamil Trzciński | 2018-07-13 | 4 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add changelog for predefined variable fixfix/gb/add-missing-before-sha-predefined-variable | Grzegorz Bizon | 2018-07-12 | 1 | -0/+5 | |
| * | | | | | | | | | | | Add missing `CI_COMMIT_BEFORE_SHA` predefined variable | Grzegorz Bizon | 2018-07-12 | 3 | -0/+4 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'ide-pipeline-icon-open' into 'master' | Filipa Lacerda | 2018-07-13 | 4 | -6/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Open pipeline list panel when clicking CI icon in Web IDEide-pipeline-icon-open | Phil Hughes | 2018-07-10 | 4 | -6/+49 | |
* | | | | | | | | | | | Merge branch 'update-docs-board-features-tier' into 'master' | Sean McGivern | 2018-07-13 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Update docs board features tierupdate-docs-board-features-tier | Victor Wu | 2018-07-13 | 1 | -5/+5 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'gitaly-mandatory-20180712-jv' into 'master' | Sean McGivern | 2018-07-13 | 4 | -200/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix find_branch call sitesgitaly-mandatory-20180712-jv | Jacob Vosmaer | 2018-07-12 | 3 | -21/+3 | |
| * | | | | | | | | | | whitespace | Jacob Vosmaer | 2018-07-12 | 1 | -9/+9 | |
| * | | | | | | | | | | Make more ref RPC's mandatory | Jacob Vosmaer | 2018-07-12 | 2 | -172/+22 | |
* | | | | | | | | | | | Merge branch 'winh-upgrade-grape-path-helpers' into 'master' | Stan Hu | 2018-07-12 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Upgrade grape-path-helpers to 1.0.6 | Winnie Hellmann | 2018-07-12 | 2 | -1/+6 |