delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert 'New file from interface on existing branch'	Douwe Maan	2017-06-16	1	-14/+0
\|
*	Merge branch 'sh-recaptcha-fix-try2' into 'master'	Sean McGivern	2017-06-16	1	-0/+1
\| \| \| \| \| \| \|	Make sure reCAPTCHA configuration is loaded when spam checks are initiated Closes #33532 See merge request !12080
*	Merge branch 'fix-external-ci-services' into 'master'	Grzegorz Bizon	2017-06-16	1	-7/+30
\| \| \| \| \| \| \| \|	Allow to access statuses for external CI services Closes #30714, #29369, and #15220 See merge request !11176
*	Merge branch 'master-security-update' into 'master'	Regis Boudinot	2017-06-08	1	-10/+20
\|\ \| \| \| \| \| \| \| \|	Master security update See merge request !12025
\| *	Merge branch 'dz-restrict-autocomplete' into 'security-9-1'	DJ Mountney	2017-06-08	1	-10/+20
\| \| \| \| \| \| \| \| \| \| \| \|	Allow users autocomplete by author_id only for authenticated users See merge request !2100
* \|	Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-ui	Alfredo Sumaran	2017-06-08	1	-3/+3
\|\ \ \| \|/
\| *	Allow group reporters to promote labelsallow-reporters-to-promote-group-labels	Sean McGivern	2017-06-08	1	-3/+3
\| \| \| \| \| \| \| \| \| \|	They can admin group labels anyway, we weren't checking the more specific permission.
* \|	Merge branch 'master' into 25426-group-dashboard-ui	Alfredo Sumaran	2017-06-07	15	-123/+327
\|\ \ \| \|/
\| *	Sync email address from specified omniauth provider	Robin Bobbitt	2017-06-07	1	-0/+31
\| \|
\| *	Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'	Douwe Maan	2017-06-07	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expand/collapse close & backlog lists in issue boards Closes #23917 See merge request !11820
\| \| *	spec updates	Phil Hughes	2017-05-31	1	-1/+1
\| \| \|
\| * \|	Merge branch 'instrument-infra' into 'master'	Grzegorz Bizon	2017-06-07	2	-39/+70
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Prometheus metrics endpoint and basic infrastructure to meter code See merge request !11553
\| \| * \|	Do not cleanup temp directory as this apparently causes silent rspec ↵	Pawel Chojnacki	2017-06-07	1	-8/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	failures on linux in CI
\| \| * \|	Add prometheus text formatter	Pawel Chojnacki	2017-06-02	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ rename controler method to #index from #metrics + remove assertion from nullMetric
\| \| * \|	Move Prometheus presentation logic to PrometheusText	Pawel Chojnacki	2017-06-02	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ Use NullMetrics to mock metrics when unused + Use method_missing in NullMetrics mocking + Update prometheus gem to version that correctly uses transitive dependencies + Ensure correct folders are used in Multiprocess prometheus client tests. + rename Sessions controller's metric
\| \| * \|	Mark migration as requiring no downtime	Pawel Chojnacki	2017-06-02	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ Add spaces for four phases approach + fix InfluxDB rename
\| \| * \|	Move most of MetricsController logic to MetricsService	Pawel Chojnacki	2017-06-02	1	-2/+3
\| \| \| \|
\| \| * \|	move check if metrics are enabled to before action	Pawel Chojnacki	2017-06-02	1	-0/+10
\| \| \| \|
\| \| * \|	Correctly handle temporary folder for testing multiproces metrics	Pawel Chojnacki	2017-06-02	1	-0/+9
\| \| \| \|
\| \| * \|	Split metrics from health controller into metrics controller	Pawel Chojnacki	2017-06-02	2	-39/+51
\| \| \| \|
\| * \| \|	Merge branch '12910-snippets-description' into 'master'	Phil Hughes	2017-06-07	3	-2/+84
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support descriptions for snippets Closes #31894 See merge request !11071
\| \| * \| \|	Support uploads for newly created personal snippets12910-snippets-description	Jarka Kadlecova	2017-06-07	1	-0/+34
\| \| \| \| \|
\| \| * \| \|	Support descriptions for snippets	Jarka Kadlecova	2017-05-31	2	-2/+50
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch '27148-limit-bulk-create-memberships' into 'master'	Douwe Maan	2017-06-06	2	-3/+12
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit non-administrators to adding 100 members at a time to groups and projects Closes #27148 See merge request !11940
\| \| * \| \|	Limit non-administrators to adding 100 members at a time to groups and projects	Nick Thomas	2017-06-06	2	-3/+12
\| \| \| \| \|
\| * \| \| \|	redesign caching of application settings	Paul Charlton	2017-06-06	1	-1/+1
\| \|/ / /
\| * \| \|	Support hard deletion in Admin::UsersController#destroy	Nick Thomas	2017-06-05	1	-2/+13
\| \| \| \|
\| * \| \|	Refactor the DeleteUserWorker	Nick Thomas	2017-06-05	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'zj-job-view-goes-real-time' into 'master'	Kamil Trzciński	2017-06-05	1	-11/+34
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Initial implementation for real time job view Closes #31397 See merge request !11651
\| \| * \| \|	Fix test failures	Kamil Trzcinski	2017-06-03	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-time	Kamil Trzcinski	2017-06-02	3	-64/+55
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	Add user to BuildDetailsEntity	Z.J. van de Weg	2017-06-02	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also add minor changed needed to pass review
\| \| * \| \|	Incorporate review	Z.J. van de Weg	2017-05-31	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Initial implementation for real time job view	Z.J. van de Weg	2017-05-31	1	-11/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	Merge branch 'mabes/gitlab-ce-bypass-auto-login' into 'master'	Douwe Maan	2017-06-02	1	-0/+31
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow manual bypass of auto_sign_in_with_provider Closes #3786 See merge request !11884
\| \| * \| \| \|	Allow manual bypass of auto_sign_in_with_providermabes/gitlab-ce-bypass-auto-login	Maxime Besson	2017-06-02	1	-0/+31
\| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| * \| \| \|	Merge branch '33139-lint-our-factories' into 'master'	Grzegorz Bizon	2017-06-02	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lint our factories creation in addition to their build Closes #33139 See merge request !11823
\| \| * \| \|	Lint our factories creation in addition to their build33139-lint-our-factories	Rémy Coutable	2017-06-02	1	-1/+1
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Skip loading application settings from the database when migrations are pending	Nick Thomas	2017-06-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Various Rails initializers (metrics, sentry, etc) are run before migrations, which can lead to a mismatch between app/models/application_settings.rb and schema.
\| * \| \|	Merge branch '31511-jira-settings' into 'master'	Sean McGivern	2017-06-02	1	-63/+49
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599
\| \| * \| \|	Address MR comments	Jarka Kadlecova	2017-06-01	1	-3/+0
\| \| \| \| \|
\| \| * \| \|	fix failing specs	Jarka Kadlecova	2017-06-01	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	simplify test&save actions when setting a service integration	Jarka Kadlecova	2017-06-01	1	-63/+52
\| \| \| \|/ \| \| \|/\|
* \| \| \|	Fix failing spec	Alfredo Sumaran	2017-06-07	1	-1/+1
\| \| \| \|
* \| \| \|	Add json support to group members leave action in controller	Dmitriy Zaporozhets	2017-06-06	1	-0/+7
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'master' into zj-realtime-env-list	Z.J. van de Weg	2017-06-01	9	-60/+87
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'rename-builds-controller' into 'master'	Kamil Trzciński	2017-05-31	3	-33/+33
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename BuildsController to JobsController Closes #30699 See merge request !11407
\| \| * \	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-31	1	-1/+5
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| \| * \ \	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-31	3	-7/+24
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 - as the prefix so we don't conflict with namespaces	Lin Jen-Shin	2017-05-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The decision was made around: https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641