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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'revert-86900f00' into 'master'	Grzegorz Bizon	2019-06-06	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Disable retrying cancelled jobs" Closes #62350 See merge request gitlab-org/gitlab-ce!29201
\| *	Revert "Merge branch..."revert-86900f00	Kamil Trzciński	2019-06-05	1	-1/+1
\| \| \| \| \| \|	This reverts merge request !27503
* \|	Merge branch 'simplify-pipeline-notification-check' into 'master'	Sean McGivern	2019-06-06	2	-13/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Simplify notification check for participating See merge request gitlab-org/gitlab-ce!29188
\| * \|	Simplify notification check for participatingsimplify-pipeline-notification-check	Heinrich Lee Yu	2019-06-06	2	-13/+4
\| \| \|
* \| \|	Merge branch 'ce-10854-elasticsearch_avoid_db' into 'master'	Sean McGivern	2019-06-06	7	-4/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of 10854-elasticsearch_avoid_db See merge request gitlab-org/gitlab-ce!28579
\| * \| \|	Backport of 10854-elasticsearch_avoid_dbce-10854-elasticsearch_avoid_db	Mario de la Ossa	2019-06-05	7	-4/+11
\| \| \| \|
* \| \| \|	Resolve "Inline validation for user's name and username length"	Jiaan	2019-06-06	6	-43/+84
\| \| \| \|
* \| \| \|	Merge branch '60034-default-web-ide-s-merge-request-checkbox-to-true' into ↵	Phil Hughes	2019-06-06	9	-38/+96
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Default Web IDE's merge request checkbox to true" Closes #60034 See merge request gitlab-org/gitlab-ce!28665
\| * \| \| \|	Default MR checkbox to true in most cases60034-default-web-ide-s-merge-request-checkbox-to-true	Sam Bigelow	2019-06-06	9	-38/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Pull the new MR option out into it's own component - Default MR checkbox to true when creating a new MR and committing to a branch that does not have an MR - Still change the MR checkbox to false when a user is on a branch that already has an MR - Hide MR option when on a branch that already has an MR and committing to current branch - Don't default to true when committing directly to master
* \| \| \| \|	Merge branch 'create-merge-request-create-pipeline-service' into 'master'	Bob Van Landuyt	2019-06-06	2	-25/+38
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce service for merge request pipeline creation See merge request gitlab-org/gitlab-ce!28781
\| * \| \| \| \|	Introduce service for merge request pipeline creationcreate-merge-request-create-pipeline-service	Shinya Maeda	2019-06-06	2	-25/+38
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't have a way to create MR pipeline today, this is one of the headaches for users. This change is a preliminary work for the capability.
* \| \| \| \|	CE Backport: Show tree within Epic containing child Epics and Issues	Kushal Pandya	2019-06-06	3	-4/+106
\| \| \| \| \|
* \| \| \| \|	Use the selected time window for metrics dashboard	Sarah Yasonik	2019-06-06	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ce-jej/fix-git-http-with-sso-enforcement' into 'master'	Jan Provaznik	2019-06-06	2	-0/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid setting Gitlab::Session on sessionless requests and Git HTTP See merge request gitlab-org/gitlab-ce!29146
\| * \| \| \|	Avoid setting Gitlab::Session on Git HTTP requestsce-jej/fix-git-http-with-sso-enforcement	James Edwards-Jones	2019-06-05	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Avoid setting Gitlab::Session on sessionless requests	James Edwards-Jones	2019-06-05	1	-0/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Migrate old notes app test from Karma to Jest	Martin Hanzel	2019-06-05	1	-0/+4
\| \|/ / \|/\| \|
* \| \|	Setup Git client for Jupyter	Amit Rathi	2019-06-05	2	-2/+11
\| \| \|
* \| \|	added new styling to the `.flash-warning` styles and moved the bundled style ↵	Michel Engelen	2019-06-05	1	-14/+15
\| \| \| \| \| \| \| \| \| \| \| \|	definitions up to allow overrides for specific flash-types
* \| \|	Merge branch 'issue_49897' into 'master'	Robert Speicher	2019-06-05	5	-11/+34
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete unauthorized Todos when project is private Closes #49897 See merge request gitlab-org/gitlab-ce!28560
\| * \| \|	Delete unauthorized Todos when project is privateissue_49897	Felipe Artur	2019-06-05	5	-11/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete Todos for guest users when project visibility level is updated to private.
* \| \| \|	Merge branch '11204-turn-off-mask-by-default' into 'master'	Mike Greiling	2019-06-05	3	-3/+3
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default masked to false for new variables Closes gitlab-ee#11204 See merge request gitlab-org/gitlab-ce!28186
\| * \| \|	Default masked to false for new variables11204-turn-off-mask-by-default	mfluharty	2019-06-04	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set the default value to false Adjust tests to expect false as the default Update documentation to make new default clear
* \| \| \|	Merge branch '54140-non-ar-cache-commit-markdown' into 'master'	Douwe Maan	2019-06-05	3	-80/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Redis for CacheMarkDownField on non AR models Closes #54140 See merge request gitlab-org/gitlab-ce!29054
\| * \| \| \|	Use markdown_field helper to display full_title	Patrick Bajao	2019-06-05	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Use Redis for CacheMarkDownField on non AR models	Patrick Bajao	2019-06-05	2	-79/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows using `CacheMarkdownField` for models that are not backed by ActiveRecord. When the including class inherits `ActiveRecord::Base` we include `Gitlab::MarkdownCache::ActiveRecord::Extension`. This will cause the markdown fields to be rendered and the generated HTML stored in a `<field>_html` attribute on the record. We also store the version used for generating the markdown. All other classes that include this model will include the `Gitlab::MarkdownCache::Redis::Extension`. This add the `<field>_html` attributes to that model and will generate the html in them. The generated HTML will be cached in redis under the key `markdown_cache:<class>:<id>`. The class this included in must therefore respond to `id`.
* \| \| \| \|	Add snowplow haml attr helper	Luke Bennett	2019-06-05	2	-11/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Helps build a hash of snowplow tracking data attrs. Updates import project pane to use new helper.
* \| \| \| \|	Merge branch 'graphql-file-entry-url' into 'master'	Nick Thomas	2019-06-05	8	-3/+38
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add web_url to tree entry in GraphQL API See merge request gitlab-org/gitlab-ce!28646
\| * \| \| \| \|	Add web_url to tree entry in GraphQL API	Phil Hughes	2019-06-05	8	-3/+38
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ce-10446-resolve-ee-diff-repository-check-mailer-notify' into ↵	Phil Hughes	2019-06-05	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [CE] Resolve CE/EE in repo check mailer notify html See merge request gitlab-org/gitlab-ce!29195
\| * \| \| \| \| \|	Resolve CE/EE in repo check mailer notify html	Paul Slaughter	2019-06-05	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '61246-fix-label-click-scroll-to-top' into 'master'	Fatih Acet	2019-06-05	1	-0/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix label click scrolling to top Closes #61246 See merge request gitlab-org/gitlab-ce!29202
\| * \| \| \| \| \|	Fix label click scrolling to top	Paul Slaughter	2019-06-05	1	-0/+5
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '28996-create-mvc-ui-in-haml' into 'master'	Filipa Lacerda	2019-06-05	8	-20/+131
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Let's Encrypt option in Pages domain new/edit Haml form See merge request gitlab-org/gitlab-ce!26438
\| * \| \| \| \| \|	Add auto SSL toggle to Pages domain settings page28996-create-mvc-ui-in-haml	Nathan Friend	2019-06-03	8	-20/+131
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds an auto SSL toggle switch to the settings page of GitLab Pages domains. This toggle enable or disabled auto SSL management via Let's Encrypt. Toggling the button dynamically updates the form using client-side JavaScript. All changes are behind feature flags.
* \| \| \| \| \| \|	Merge branch 'osw-avoid-500-on-suggestions-check' into 'master'	Lin Jen-Shin	2019-06-05	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid 500 when evaluating `DiffNote#supports_suggestion?` and commit is not reachable Closes #57570 See merge request gitlab-org/gitlab-ce!25408
\| * \| \| \| \| \|	Avoid 500's when commit is not reachable	Oswaldo Ferreira	2019-06-05	1	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Extract setListDetail() into issue boards store	Winnie Hellmann	2019-06-05	3	-2/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Jan Provaznik	2019-06-05	2	-0/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'11925-geo-sidekiq-nodes-try-to-run-jobs-even-thought-db-is-readonly' into 'master' Ensure DB is writable before continuing jobs See merge request gitlab-org/gitlab-ce!29134
\| * \| \| \| \|	Ensure DB is writable before continuing jobs11925-geo-sidekiq-nodes-try-to-run-jobs-even-thought-db-is-readonly	Ash McKenzie	2019-06-05	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the context of a Geo setup, some jobs can be running on a Geo secondary where the database is read-only and therefore we should guard against various jobs attempting to write.
* \| \| \| \| \|	Merge branch 'bvl-use-global-ids-graphql' into 'master'	Jan Provaznik	2019-06-05	7	-7/+37
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use global IDs when exposing GraphQL resources Closes #62650 See merge request gitlab-org/gitlab-ce!29080
\| * \| \| \| \| \|	Fix incorrect instances of `GraphQL::ID_TYPE`	Bob Van Landuyt	2019-06-03	5	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the `GraphQL::ID_TYPE` usages should represent globally unique ids, this changes some fields for which this is not the case into strings. The `ID_TYPE` is a specialised, so this change should be backwards compatible. https://graphql-ruby.org/type_definitions/scalars.html
\| * \| \| \| \| \|	Expose IDs in GraphQL as a GlobalID	Bob Van Landuyt	2019-06-03	2	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This exposes all fields named `id` as GlobalIDs so they can be used across our entire GraphQL implementation. When the objects loaded are `ApplicationRecord`s. We'll use our existing batchloading to find them. Otherwise, we'll fall back to the default implementation of `GlobalID`: Calling the `.find` method on the class.
* \| \| \| \| \| \|	Merge branch 'jivanvl-add-single-stat-chart-component' into 'master'	Filipa Lacerda	2019-06-05	1	-0/+37
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add single_stat chart component to the monitoring bundle See merge request gitlab-org/gitlab-ce!28948
\| * \| \| \| \| \| \|	Add single_stat chart component to the monitoring bundlejivanvl-add-single-stat-chart-component	Jose Vargas	2019-06-04	1	-0/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This merge requests just adds the component without integrating it to the dashboard, it adds tests as well
* \| \| \| \| \| \| \|	Fix Web IDE add template test	Mark Lapierre	2019-06-05	3	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wait for the new file modal to stop animating before clicking it We now need to click the commit button 3 times: 1. To enter commit mode 2. To being staging changes 3. To submit the commit
* \| \| \| \| \| \| \|	Merge branch 'revert-git-depth-for-merge-request' into 'master'	Kamil Trzciński	2019-06-05	1	-3/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert a default GIT_DEPTH for MR pipeline See merge request gitlab-org/gitlab-ce!28926
\| * \| \| \| \| \| \|	Revert a default GIT_DEPTH for MR pipelinerevert-git-depth-for-merge-request	Fabio Pitino	2019-05-31	1	-3/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '55253-activity-feed-ui-enhance-line-height' into 'master'	Phil Hughes	2019-06-05	2	-3/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Activity feed UI: Enhance line-height" Closes #55253 See merge request gitlab-org/gitlab-ce!28856
\| * \| \| \| \| \| \| \|	Enhance line-height of Activity feed UI55253-activity-feed-ui-enhance-line-height	Jacopo	2019-05-31	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enhances line-height of Activity feed UI to 20px.