| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | | | | | | |||||
| | * | | | | | | 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 | 1 | -6/+29 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml # config/webpack.config.js | ||||
| | * | | | | | | | Updated specs, added rewire, updated layouts to move conditional raven and ↵ | Luke "Jared" Bennett | 2017-04-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gon to head | ||||
| | * | | | | | | | [ci skip] Remove loadscript class in favour of backend conditional | Luke "Jared" Bennett | 2017-04-13 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-04 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb | ||||
| | * | | | | | | | Updated webpack config | Phil Hughes | 2017-05-04 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-05-03 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | | Re-wrote to match our docs - still not 100% sure but closer than it was | Phil Hughes | 2017-04-28 | 1 | -0/+1 |
| | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-02 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | Move PDFLab into GitLabpdflab-in-repo | Sam Rose | 2017-04-28 | 1 | -0/+5 |
| | |/ / / / / | |||||
| * | | | | | | Merge remote-tracking branch ↵ | Phil Hughes | 2017-04-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | 'origin/28433-internationalise-cycle-analytics-page' into js-translations | ||||
| | * \ \ \ \ \ | Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-04-20 | 1 | -0/+13 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Conflicts: config/webpack.config.js | ||||
| * | | | | | | | Merge remote-tracking branch ↵ | Phil Hughes | 2017-04-20 | 1 | -8/+9 |
| |\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | 'origin/28433-internationalise-cycle-analytics-page' into js-translations | ||||
| | * | | | | | Remove special naming of pipelines folder | Filipa Lacerda | 2017-04-19 | 1 | -9/+9 |
| | | | | | | | |||||
| | * | | | | | Issue Title Vue: convert to .vue - use 'render' with 'createElement' in index | Regis Boudinot | 2017-04-15 | 1 | -0/+1 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Fixed missing text | Phil Hughes | 2017-04-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Fixed duplicated time in dropdown | ||||
| * | | | | | Added Vue filters & directives for translating | Phil Hughes | 2017-04-18 | 1 | -0/+8 |
| | | | | | | |||||
| * | | | | | Started internationalising cycyle analytics | Phil Hughes | 2017-04-15 | 1 | -0/+5 |
| |/ / / / | |||||
| * | | | | Improve webpack-dev-server compatibility with non-localhost setups. | Mike Greiling | 2017-04-12 | 1 | -1/+3 |
| | |_|/ |/| | | |||||
| * | | | watch node_modules for changes when a module is missing | Mike Greiling | 2017-04-10 | 1 | -0/+5 |
| | | | | |||||
| * | | | clean up webpack config | Mike Greiling | 2017-04-09 | 1 | -5/+6 |
| | | | | |||||
| * | | | add vue-loader dependencies and basic config | Mike Greiling | 2017-04-09 | 1 | -0/+4 |
| | |/ |/| | |||||
| * | | Add a name field to the group edit formadd-field-for-group-name | Douglas Lovell | 2017-04-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables user specification of group name vs. name inferred from group path. Cause new group form to copy name from path Adds some new page-specific javascript that copies entry from the group path field to the group name field when the group name field is initially empty. Remove duplicate group name entry field on group edit form This corrects the duplicated name entry field and tests that the JavaScript does not update the group name field if the user edits the group path. (Editing the group path is not recommended in any case, but it is possible.) Address eslint errors in group.js Enable group name copy with dispatch and explore group creation The dispatch and explore group creation forms require the group.js asset, and their tests now require testing against poltergeist Update workflow new group instruction Update the gitlab basics group creation document Add a change log entry Remove unused variable for eslint | ||||
| * | | Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags | James Edwards-Jones | 2017-04-06 | 1 | -0/+1 |
| |\ \ | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |