Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'revert-58d1cd6b' into 'master' | Stan Hu | 2017-05-07 | 1 | -1/+1 |
|\ | |||||
| * | Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-depreca...revert-58d1cd6b | Stan Hu | 2017-05-07 | 1 | -1/+1 |
* | | Add Pipeline Schedules that supersedes experimental Trigger Schedule | Zeger-Jan van de Weg | 2017-05-07 | 4 | -4/+12 |
|/ | |||||
* | Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' in... | Stan Hu | 2017-05-07 | 1 | -1/+1 |
|\ | |||||
| * | Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection ca...fix-rspec_profiling-establish_connection-string-deprecation | Luke "Jared" Bennett | 2017-05-07 | 1 | -1/+1 |
* | | Single commit squash of all changes for https://gitlab.com/gitlab-org/gitlab-... | Kamil Trzcinski | 2017-05-06 | 1 | -0/+2 |
|/ | |||||
* | Use an absolute path for locale path in FastGettext configuse-absolute-path-for-gettext-config | Ruben Davila | 2017-05-05 | 1 | -1/+1 |
* | Merge branch 'fix/admin-integrations' into 'master' | Sean McGivern | 2017-05-05 | 1 | -0/+1 |
|\ | |||||
| * | refactor code based on feedback | James Lopez | 2017-05-05 | 1 | -1/+1 |
| * | fix sidekiq spec, add changelog | James Lopez | 2017-05-04 | 1 | -0/+1 |
* | | Merge branch 'mia_backort' into 'master' | Jacob Schatz | 2017-05-05 | 1 | -3/+2 |
|\ \ | |||||
| * | | [skip ci] Fix FE conflicts with master | Clement Ho | 2017-05-05 | 1 | -5/+0 |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ... | Valery Sizov | 2017-05-05 | 10 | -0/+522 |
| |\ \ | |||||
| * | | | Fix webpack config conflict | Clement Ho | 2017-05-04 | 1 | -5/+0 |
| * | | | Backport of multiple_assignees_feature [ci skip] | Valery Sizov | 2017-05-04 | 1 | -1/+6 |
* | | | | Merge branch '24883-build-failure-summary-page' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Build failures summary page for pipelines | James Edwards-Jones | 2017-05-05 | 1 | -0/+1 |
* | | | | | Merge branch 'balsalmiq-support' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into balsalmiq-support | Luke "Jared" Bennett | 2017-05-02 | 3 | -6/+15 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-05-02 | 2 | -0/+7 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into balsalmiq-support | Luke "Jared" Bennett | 2017-04-30 | 3 | -4/+8 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into balsalmiq-support | Luke "Jared" Bennett | 2017-04-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix webpack config conflicts bad resolution | Luke "Jared" Bennett | 2017-04-27 | 1 | -0/+2 |
| * | | | | | | | | | Merge branch 'master' into balsalmiq-support | Luke "Jared" Bennett | 2017-04-27 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-04-26 | 11 | -123/+133 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-04-12 | 2 | -4/+68 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Get initial sql values back from file which is database | Jacob Schatz | 2017-04-10 | 1 | -0/+5 |
| * | | | | | | | | | | | | Initial balsamiq support | Jacob Schatz | 2017-04-10 | 1 | -0/+1 |
* | | | | | | | | | | | | | Merge branch 'add-sentry-js-again-with-vue' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-05-04 | 3 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Review changes, removed api/v3 updates as its frozen, removed the clientside_... | Luke "Jared" Bennett | 2017-05-04 | 1 | -3/+0 |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-04 | 2 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-03 | 7 | -15/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-04-28 | 2 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-04-28 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed specs | Luke "Jared" Bennett | 2017-04-28 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Attempted adding separate clientside_sentry settings | Luke "Jared" Bennett | 2017-04-28 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-04-26 | 10 | -119/+124 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Removed rewire and fixed tests | Luke "Jared" Bennett | 2017-04-15 | 1 | -2/+1 |
| * | | | | | | | | | | | | | | Only rewire in dev | Luke "Jared" Bennett | 2017-04-15 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-04-15 | 9 | -23/+138 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Updated specs, added rewire, updated layouts to move conditional raven and go... | Luke "Jared" Bennett | 2017-04-15 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | [ci skip] Remove loadscript class in favour of backend conditional | Luke "Jared" Bennett | 2017-04-13 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'mrchrisw-import-shell-timeout' | Sean McGivern | 2017-05-05 | 2 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeout | Chris Wilson | 2017-04-27 | 2 | -0/+4 |
* | | | | | | | | | | | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-04 | 4 | -1/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'deploy-keys-load-async' into 'master' | Filipa Lacerda | 2017-05-04 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Updated webpack config | Phil Hughes | 2017-05-04 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-05-04 | 2 | -0/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-05-03 | 8 | -16/+38 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |