Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-ui | Alfredo Sumaran | 2017-06-08 | 1 | -9/+1 |
|\ | |||||
| * | Translate project & repository pages | Bob Van Landuyt | 2017-06-07 | 1 | -9/+1 |
| | | |||||
* | | Merge branch 'master' into 25426-group-dashboard-ui | Alfredo Sumaran | 2017-06-07 | 1 | -5/+12 |
|\ \ | |/ | |||||
| * | Merge branch ↵ | Tim Zallmann | 2017-06-04 | 1 | -3/+11 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | '32992-consider-using-zopfli-over-standard-gzip-compression-for-webpack-assets' into 'master' Use zopfli for better asset compression and disable compression in CI Closes #32992 See merge request !11798 | ||||
| | * | utilize zopfli compression algorithm for frontend assets | Mike Greiling | 2017-05-30 | 1 | -0/+2 |
| | | | |||||
| | * | skip asset compression in CI | Mike Greiling | 2017-05-30 | 1 | -3/+9 |
| | | | |||||
| * | | Merge branch '31511-jira-settings' into 'master' | Sean McGivern | 2017-06-02 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599 | ||||
| | * | | Add Integrations bundle | kushalpandya | 2017-06-01 | 1 | -0/+1 |
| | |/ | |||||
| * | | Merge branch 'winh-karma-sourcemaps' into 'master' | Filipa Lacerda | 2017-06-02 | 1 | -2/+0 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | Use inline source maps for karma Closes #30996 See merge request !11815 | ||||
| | * | Use inline source maps for karma (!11815)winh-karma-sourcemaps | winh | 2017-05-31 | 1 | -2/+0 |
| | | | |||||
* | | | Address feedback | Alfredo Sumaran | 2017-06-07 | 1 | -0/+1 |
| | | | |||||
* | | | Restore code to make explore groups work | Alfredo Sumaran | 2017-06-07 | 1 | -0/+1 |
| | | | |||||
* | | | Remove non existent bundle | Alfredo Sumaran | 2017-06-06 | 1 | -1/+0 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-ui | Dmitriy Zaporozhets | 2017-06-02 | 1 | -10/+54 |
|\ \ \ | |/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch '31849-pipeline-show-view-realtime' into 'master' | Phil Hughes | 2017-05-30 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Creates a mediator for pipeline details vue in order to mount several vue apps with the same data Closes #31849 See merge request !11732 | ||||
| | * | | Creates a mediator for pipeline details vue in order to mount several vue ↵ | Filipa Lacerda | 2017-05-26 | 1 | -3/+3 |
| | |/ | | | | | | | | | | apps with the same data | ||||
| * | | Merge branch 'locale-region-fix' into 'master' | Douwe Maan | 2017-05-26 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed locale frontend not picking up regions Closes #32913 See merge request !11717 | ||||
| | * | | Fixed locale frontend not picking up regionslocale-region-fix | Phil Hughes | 2017-05-25 | 1 | -1/+1 |
| | |/ | | | | | | | | | | | | | | | | This was caused by a webpack config issue that would only look in folders that only had lower case letters. This has been changed to include any word character Closes #32913 | ||||
| * | | name all webpack chunks to improve long term cacheability | Mike Greiling | 2017-05-25 | 1 | -1/+13 |
| | | | |||||
| * | | add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin | Mike Greiling | 2017-05-25 | 1 | -1/+3 |
| |/ | |||||
| * | drop HashedModuleIdsPlugin in favor of NamedModulesPlugin in all environments32835-stop-using-webpack-hashedmoduleidsplugin-in-production | Mike Greiling | 2017-05-23 | 1 | -4/+2 |
| | | |||||
| * | Consolidate user avatar Vue logic | Bryce Johnson | 2017-05-18 | 1 | -2/+3 |
| | | |||||
| * | Merge branch 'use-common-vue-for-merge-request-widget' into 'master' | Fatih Acet | 2017-05-16 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Ensure vue_merge_request_widget utilizes common_vue bundle See merge request !11269 | ||||
| | * | ensure merge-request-widget utilizes common_vue bundleuse-common-vue-for-merge-request-widget | Mike Greiling | 2017-05-15 | 1 | -0/+1 |
| | | | |||||
| * | | Add test.js and test.css to disable animations during testing and include ↵disable-css-and-jquery-animations-for-capybara | Luke "Jared" Bennett | 2017-05-15 | 1 | -0/+1 |
| |/ | | | | | | | these in _head when testing | ||||
| * | Added balsamiq jasmine integration test | Luke "Jared" Bennett | 2017-05-15 | 1 | -1/+1 |
| | | |||||
| * | ensure schedule_form and schedules_index both utilize common_vue bundleuse-common-vue-for-pipeline-schedule-bundles | Mike Greiling | 2017-05-12 | 1 | -1/+3 |
| | | |||||
| * | Merge branch 'remove-balsamiq-module-from-common_vue-bundle' into 'master' | Filipa Lacerda | 2017-05-11 | 1 | -1/+0 |
| |\ | | | | | | | | | | | | | | | | | | | Remove balsamiq module from common_vue bundle Closes #32092 See merge request !11248 | ||||
| | * | Remove balsamiq module from common_vue bundleremove-balsamiq-module-from-common_vue-bundle | Luke "Jared" Bennett | 2017-05-10 | 1 | -1/+0 |
| | | | |||||
| * | | ensure filtered_search utilizes common_vue bundleuse-common-vue-for-filtered-search | Mike Greiling | 2017-05-10 | 1 | -0/+1 |
| |/ | |||||
| * | Merge request widget redesign | Fatih Acet | 2017-05-09 | 1 | -1/+1 |
| | | |||||
| * | Add Pipeline Schedules that supersedes experimental Trigger Schedule | Zeger-Jan van de Weg | 2017-05-07 | 1 | -0/+2 |
| | | |||||
| * | Single commit squash of all changes for ↵ | Kamil Trzcinski | 2017-05-06 | 1 | -0/+2 |
| | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878 It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash. | ||||
| * | Merge branch 'mia_backort' into 'master' | Jacob Schatz | 2017-05-05 | 1 | -3/+2 |
| |\ | | | | | | | | | | | | | Backport of Multiple Assignees feature See merge request !11089 | ||||
| | * | [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 | 1 | -0/+20 |
| | |\ | | | | | | | | | | | | | skip] | ||||
| | * | | 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 'balsalmiq-support' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Initial balsamiq support See merge request !10564 | ||||
| | * \ \ | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-05-02 | 1 | -0/+5 |
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | # Conflicts: # spec/features/projects/commit/cherry_pick_spec.rb # spec/features/projects/environments/environment_spec.rb | ||||
| | * | | | 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-26 | 1 | -9/+10 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| | * \ \ \ | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-04-12 | 1 | -4/+14 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/blob.rb | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | Add sentry JS See merge request !6764 | ||||
| | * | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-05-04 | 1 | -0/+2 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-03 | 1 | -0/+5 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | * | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-04-26 | 1 | -8/+9 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| | * | | | | | | Removed rewire and fixed tests | Luke "Jared" Bennett | 2017-04-15 | 1 | -2/+1 |
| | | | | | | | |