summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update CHANGELOG.md for 9.1.6Regis2017-06-021-0/+4
| | | [ci skip]
* Update CHANGELOG.md for 9.0.9Regis2017-06-021-0/+4
| | | [ci skip]
* Update CHANGELOG.md for 9.2.4Regis2017-06-021-0/+4
| | | [ci skip]
* Merge remote-tracking branch 'gitlab-ce/master'Grzegorz Bizon2017-06-01703-4619/+13091
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ce/master: (349 commits) Revert "Update GITLAB_SHELL_VERSION" Update GITLAB_SHELL_VERSION Add feature toggles through Flipper Add GitLab Resources to University Add Documentation for GIT_CHECKOUT variable Remove entry variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Introduce source to pipeline entity Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions ...
| * Merge branch 'patch-23' into 'master'Sid Sijbrandij2017-05-311-0/+1
| |\ | | | | | | | | | | | | Add GitLab Resources to University See merge request !11832
| | * Add GitLab Resources to UniversityTim Anglade2017-05-311-0/+1
| | |
| * | Merge branch 'trigger-source' into 'master'Grzegorz Bizon2017-05-3130-35/+116
| |\ \ | | | | | | | | | | | | | | | | Introduce source to pipeline entity See merge request !11682
| | * \ Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-31182-851/+3528
| | |\ \ | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * | | Introduce source to pipeline entitytrigger-sourceKamil Trzcinski2017-05-3130-35/+116
| | | | |
| * | | | Revert "Update GITLAB_SHELL_VERSION"Alejandro RodrĂ­guez2017-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 0d55def4d3cf8f976fe09a05301afce828b95a96.
| * | | | Update GITLAB_SHELL_VERSIONAlejandro RodrĂ­guez2017-05-311-1/+1
| | |/ / | |/| | | | | | | | | | | | | | This change continues with the plan to change the parameters passed around GitLab components to allow for independence of mount points. See https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/130#note_28747613
| * | | Merge branch 'feature-flags-flipper' into 'master'Dmitriy Zaporozhets2017-05-3117-5/+483
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add feature toggles through Flipper See merge request !11747
| | * | | Add feature toggles through FlipperAlejandro RodrĂ­guez2017-05-3117-5/+483
| |/ / /
| * | | Merge branch 'dm-gitmodules-parsing' into 'master'Grzegorz Bizon2017-05-313-17/+47
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make .gitmodules parsing more resilient to syntax errors Closes #26009 See merge request !11803
| | * | | Remove entry variabledm-gitmodules-parsingDouwe Maan2017-05-311-10/+9
| | | | |
| | * | | Make .gitmodules parsing more resilient to syntax errorsDouwe Maan2017-05-303-16/+47
| | | | |
| * | | | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-3169-337/+637
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Rename BuildsController to JobsController Closes #30699 See merge request !11407
| | * | | Rename the other jobsrename-builds-controllerLin Jen-Shin2017-05-311-8/+8
| | | | |
| | * | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-3147-125/+1011
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (63 commits) Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions Check only a merge ability for protected actions Add tag_list param to project api Allow PostReceivePack to be enabled with Gitaly Remove some deprecated methods Add :owned param to ProjectFinder ...
| | * | | | Update jobs_spec for changes from builds_specLin Jen-Shin2017-05-312-496/+18
| | | | | |
| | * | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-31315-1972/+4730
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (116 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
| | * | | | | Use another scope to add the - prefix, feedback:Lin Jen-Shin2017-05-311-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11407#note_30922591
| | * | | | | Update changelog to reflect the new schemeLin Jen-Shin2017-05-271-1/+1
| | | | | | |
| | * | | | | Should escape the routes because we added -Lin Jen-Shin2017-05-271-1/+1
| | | | | | |
| | * | | | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-2611-26/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decision was made around: https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641
| | * | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-261029-5552/+10902
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (307 commits) Address feedback Add small update for the i18n guide. update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin name all webpack chunks to improve long term cacheability add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin upgrade to latest webpack version Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ Provide default for calculating label text color (!11681) Add failing test for #32728 Bugfix: Always use the default language when generating emails. Remove unecessary commit pattern check Add regexp_for_value helper method Remove shared example and improve sub_group_issuables_spec.rb Remove 'should' from scenario in has_subgroup_title_spec.rb Cartfile git and binary methods cannot take a GitHub repo Fix terminals support for Kubernetes service Add review comments to compare_spec.rb Fix transient error clicking dropdown items in compare_spec.rb Use non-global jQuery reference within raven bundle ...
| | * | | | | | Routing helpers are no longer neededLin Jen-Shin2017-05-241-3/+0
| | | | | | | |
| | * | | | | | Add checks before redirect, remove status/traceLin Jen-Shin2017-05-244-38/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatible urls, which were for javascripts
| | * | | | | | Use controllers to redirectLin Jen-Shin2017-05-233-44/+100
| | | | | | | |
| | * | | | | | Separate artifacts from builds, reusing artifacts_action_pathLin Jen-Shin2017-05-192-22/+39
| | | | | | | |
| | * | | | | | Complete all legacy builds URL. Tests are addedLin Jen-Shin2017-05-196-23/+176
| | | | | | | |
| | * | | | | | Use a single route, reducing duplicationLin Jen-Shin2017-05-181-27/+16
| | | | | | | |
| | * | | | | | Disable rubocop hash check for blocksLin Jen-Shin2017-05-182-1/+7
| | | | | | | |
| | * | | | | | Fix JS dispatcher for job traceLin Jen-Shin2017-05-181-1/+1
| | | | | | | |
| | * | | | | | Add backward compatible routes for buildsLin Jen-Shin2017-05-182-0/+576
| | | | | | | |
| | * | | | | | Add changelog entryLin Jen-Shin2017-05-181-0/+4
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-1866-180/+479
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (31 commits) Remove 'no changes' entries from changelog Check if OLD is set when migrating issue assignees Fix data migration from trigger schedules Replace EFS section in AWS guide Add warning about AWS EFS and performance Consolidate opening text from about.gitlab.com and add active/passive note Fix invalid object reference in ee_compat_check script Fix Ordered Task List Items Add auxiliary viewer for README Update fe_guide testing.md Add auxiliary blob viewer for CHANGELOG Add spec for last commit info when browsing repository files Show last commit for current tree on tree page Use same last commit widget on project homepage and tree view Fix unassigned checkmark Add missing changelog for iPython notebook rendering feature Convert fa-history to svg; tweak alignment Get rid of pluck in app/services/members/authorized_destroy_service.rb Removes duplicate environment variable in documentation Fixed spacing issues in issue sidebar ...
| | * | | | | | | Add migration to rename projects named jobsLin Jen-Shin2017-05-172-1/+15
| | | | | | | | |
| | * | | | | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-1760-182/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename other URL generators admin_builds_path -> admin_jobs_path Fix tests and more renaming Fix more tests Also change build_id to job_id in the controller
| * | | | | | | | Merge branch 'git-checkout-variable-documentation' into 'master'Achilleas Pipinellis2017-05-311-0/+30
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Documentation for GIT_CHECKOUT variable See merge request !11748
| | * | | | | | | | Add Documentation for GIT_CHECKOUT variableJan Christophersen2017-05-311-0/+30
| |/ / / / / / / /
| * | | | | | | | Merge branch 'task-list-2' into 'master'Filipa Lacerda2017-05-319-266/+19
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update task_list to version 2.0.0 Closes #22470 See merge request !11525
| | * | | | | | | | Include deckar01-task_list with import instead of requireJared Deckard2017-05-231-1/+1
| | | | | | | | | |
| | * | | | | | | | Use native change event in the spec to trigger addEventListenerJared Deckard2017-05-232-2/+6
| | | | | | | | | |
| | * | | | | | | | Add changelogJared Deckard2017-05-231-0/+4
| | | | | | | | | |
| | * | | | | | | | Upgrade to task_list v2Jared Deckard2017-05-236-264/+9
| | | | | | | | | |
| * | | | | | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-3146-96/+2057
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue inline editing Closes #24873 See merge request !11322
| | * | | | | | | | | enable meta+enter shortcut to quick submitissue-edit-inlinePhil Hughes2017-05-304-6/+21
| | | | | | | | | | |
| | * | | | | | | | | fixed issuable shortcuts not workingPhil Hughes2017-05-308-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moved setstate method into store
| | * | | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-30413-3321/+7417
| | |\ \ \ \ \ \ \ \ \