Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-05Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes
Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478
2017-06-05Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński
Initial implementation for real time job view Closes #31397 See merge request !11651
2017-06-05Merge branch '30469-convdev-index' into 'master'Sean McGivern
ConvDev Index Closes #30469 See merge request !11377
2017-06-03Merge branch 'mabes/gitlab-ce-bypass-auto-login' into 'master'Douwe Maan
Allow manual bypass of auto_sign_in_with_provider Closes #3786 See merge request !11884
2017-06-02Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski
2017-06-02Allow manual bypass of auto_sign_in_with_providerMaxime Besson
This commit lets a user bypass the automatic signin on the login form, in order to login with a technical (admin, etc) account Closes #3786 Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-02Merge branch 'jouve/gitlab-ce-admin_keys' into 'master'Rémy Coutable
redirect to keys index instead of user index after a key is deleted See merge request !11856
2017-06-02Merge remote-tracking branch 'origin/master' into ↵Luke "Jared" Bennett
fix-realtime-edited-text-for-issues-9-3
2017-06-02Merge branch '31511-jira-settings' into 'master'Sean McGivern
Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599
2017-06-02Address review commentsJarka Kadlecova
2017-06-01Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński
Realtime env list Closes #31701 See merge request !11333
2017-06-01Merge branch '24196-protected-variables' into 'master'Kamil Trzciński
Implementation for protected variables Closes #24196 See merge request !11688
2017-06-01redirect to keys index instead of user index after a key is deletedCyril Jouve
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-01Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski
2017-06-01Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg
2017-06-01Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern
Consistent diff and blob size limit names See merge request !11776
2017-06-01Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg
2017-06-01Rename build to jobZ.J. van de Weg
2017-06-01Merge branch 'master' into '24196-protected-variables'Kamil Trzciński
# Conflicts: # db/schema.rb
2017-06-01Add feature tests for improved JIRA settingsJarka Kadlecova
2017-06-01simplify test&save actions when setting a service integrationJarka Kadlecova
2017-06-01Merge branch 'master' into 'trigger-source'Grzegorz Bizon
# Conflicts: # db/schema.rb
2017-05-31Initial implementation for real time job viewZ.J. van de Weg
Added the needed keys and paths to a new entity, BuildDetailsEntity. Not renaming BuildEntity to BuildBasicEntity on explicit request. Most code now has test coverage, but not all. This will be added on later commits on this branch. Resolves gitlab-org/gitlab-ce#31397
2017-05-31Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin
* upstream/master: (141 commits) Add Documentation for GIT_CHECKOUT variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec 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 Use another scope to add the - prefix, feedback: Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions ...
2017-05-31Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński
Rename BuildsController to JobsController Closes #30699 See merge request !11407
2017-05-31Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda
Issue inline editing Closes #24873 See merge request !11322
2017-05-31Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin
* 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 ...
2017-05-31Introduce source to pipeline entityKamil Trzcinski
2017-05-31Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin
* upstream/master: (89 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 ...
2017-05-31Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett
2017-05-31Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin
* 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 ...
2017-05-31Remove some deprecated methodsToon Claes
To avoid the use of slow queries, remove some deprecated methods and encourage the use of ProjectFinder to find projects.
2017-05-30Merge branch 'master' into issue-edit-inlinePhil Hughes
2017-05-30Consistent diff and blob size limit namesDouwe Maan
2017-05-29Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan
Rework project authorizations and nested groups for better performance See merge request !10885
2017-05-26Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)
# Conflicts: # db/schema.rb
2017-05-26Add per page to user autocompleteClement Ho
2017-05-26Merge branch 'dm-consistent-last-push-event' into 'master'Robert Speicher
Consistently display last push event widget See merge request !11585
2017-05-26Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin
* 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 ...
2017-05-26Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher
Clean up diff rendering See merge request !11390
2017-05-25Consistently display last push event widgetDouwe Maan
2017-05-25Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'Douwe Maan
Bugfix: Always use the default language when generating emails. Closes #32748 See merge request !11662
2017-05-25Bugfix: Always use the default language when generating emails.Ruben Davila
There was a race condition issue when the application was generating an email and was using a language that was previously being used in other request.
2017-05-25Merge branch 'revert-b0498c17' into 'master'Robert Speicher
Refactor `DynamicPathValidator` and `GitLab::Regex` some more See merge request !11693
2017-05-25Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets
Implement Web Hooks calls logging Closes #17848 See merge request !11027
2017-05-25Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg
2017-05-25Frontend implementation, tests, and changelogLin Jen-Shin
2017-05-25Warn before moving issue in inline edit formPhil Hughes
[ci skip]
2017-05-25Merge branch 'master' into issue-edit-inlinePhil Hughes
2017-05-25Implement web hooks loggingAlexander Randa
* implemented logging of project and system web hooks * implemented UI for user area (project hooks) * implemented UI for admin area (system hooks) * implemented retry of logged webhook * NOT imeplemented log remover