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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	Minor tweaks	Joshua Lambert	2017-08-25	3	-4/+4
\| \| \| \|
\| * \| \|	Update k8s docs	Joshua Lambert	2017-08-25	4	-35/+9
\| \| \| \|
* \| \| \|	Merge branch ↵	Douwe Maan	2017-08-31	46	-24/+84
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37266-nomethoderror-undefined-method-current_application_settings-build-failed-30837482' into 'master' `current_application_settings` belongs on `Gitlab::CurrentSettings` Closes #37266 See merge request !13955
\| * \| \| \|	`current_application_settings` belongs on `Gitlab::CurrentSettings`	Sean McGivern	2017-08-31	46	-24/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
* \| \| \| \|	Merge branch 'sidebar-cache-updates' into 'master'	Sean McGivern	2017-08-31	5	-0/+47
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only update the sidebar count caches when needed See merge request !13878
\| * \| \| \| \|	Only update the sidebar count caches when neededsidebar-cache-updates	Yorick Peterse	2017-08-30	5	-0/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures the issues/MR cache of the sidebar is only updated when the state or confidential flags changes, instead of changing this for every update.
* \| \| \| \| \|	Merge branch 'zj-disable-pages-in-subgroups' into 'master'	Grzegorz Bizon	2017-08-31	8	-4/+50
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show references to Pages when not available Closes #34864 See merge request !13888
\| * \| \| \| \| \|	Don't show references to Pages when not available	Zeger-Jan van de Weg	2017-08-31	8	-4/+50
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In this instance its subgroups, and given we can't deploy it, we shouldn't allow it to be shown. Fixes gitlab-org/gitlab-ce#34864
* \| \| \| \| \|	Merge branch '28938-password-change-workflow-for-admins' into 'master'	Sean McGivern	2017-08-31	3	-16/+36
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes the password change workflow for admins. Closes #28938 See merge request !13901
\| * \| \| \| \| \|	Changes the password change workflow for admins.28938-password-change-workflow-for-admins	Tiago Botelho	2017-08-31	3	-16/+36
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'backstage/gb/optimize-system-note-service-specs' into 'master'	Sean McGivern	2017-08-31	1	-22/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize system note service specs See merge request !13958
\| * \| \| \| \| \| \|	Optimize system note service specs	Grzegorz Bizon	2017-08-31	1	-22/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '31470-api-file-raw' into 'master'	Sean McGivern	2017-08-31	3	-6/+22
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the /projects/:id/repository/files/:file_path/raw endpoint to handle dots in the file_path… Closes #31470 See merge request !13512
\| * \| \| \| \| \| \| \|	fix :file_path - add requirements:	Marc Siegfriedt	2017-08-30	3	-6/+22
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'gitaly-440-shell-fetch-remote' into 'master'	Sean McGivern	2017-08-31	6	-35/+107
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Repository.FetchRemote to Gitaly See merge request !13625
\| * \| \| \| \| \| \| \| \|	Migrate Repository.FetchRemote to Gitalygitaly-440-shell-fetch-remote	Kim "BKC" Carlbäcker	2017-08-30	6	-35/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- `Gitlab::Shell.fetch_remote` now takes a `Gitlab::Git::Repository` instead
* \| \| \| \| \| \| \| \| \|	Merge branch '28202_decrease_abc_threshold_step3' into 'master'	Grzegorz Bizon	2017-08-31	3	-41/+48
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decrease ABC threshold to 55.25 See merge request !13904
\| * \| \| \| \| \| \| \| \| \|	Decrease ABC threshold to 55.25	Maxim Rydkin	2017-08-31	3	-41/+48
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '37179-dashboard-project-dropdown' into 'master'	Phil Hughes	2017-08-31	3	-20/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes disabled state from projects dropdown in dashboard page Closes #37179 See merge request !13933
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into 37179-dashboard-project-dropdown37179-dashboard-project-dropdown	Filipa Lacerda	2017-08-31	112	-794/+1536
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (65 commits) Upgrade mail and nokogiri gems due to security issues Link out to stackoverflow answer on setting swappiness Document swappiness recomendations in the requirements doc Fix invalid attribute used for time-ago-tooltip component Update latest artifacts doc Add changelog entry for flipping verify_certificates Default LDAP config verify_certificates to true Update share project with groups docs remove accidental console.log from karma tests update specs to match reorganized monitoring components Remove tooltips from new sidebar Use `git update-ref --stdin -z` to delete refs Don't use public_send in destroy_conditionally! helper Remove unused expressions policy from ci/cd config Simplify code for appending strategies in CI/CD config Raise exception when simplifiable ci entry incomplete Add changelog entry Fix MySQL failure for emoji autocomplete max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably) Make namespace dropdown on new project page consistent ...
\| * \| \| \| \| \| \| \| \| \| \|	Use the correct scope to avoid triggering all dropdowns	Filipa Lacerda	2017-08-30	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	puts back `function` statements	Filipa Lacerda	2017-08-30	1	-20/+20
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Removes disabled state from projects dropdown in dashboard page	Filipa Lacerda	2017-08-30	3	-39/+35
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '36917-branch-tooltip' into 'master'	Phil Hughes	2017-08-31	2	-5/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a tooltip to the branch name Closes #36917 See merge request !13925
\| * \| \| \| \| \| \| \| \| \| \|	Adds a tooltip to the branch name	Filipa Lacerda	2017-08-31	2	-5/+20
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch '31358_decrease_perceived_complexity_threshold_step1' into 'master'	Grzegorz Bizon	2017-08-31	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decrease Metrics/PerceivedComplexity threshold to 17 See merge request !13947
\| * \| \| \| \| \| \| \| \| \| \|	Decrease Metrics/PerceivedComplexity threshold to 17	Maxim Rydkin	2017-08-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '26692-predefined-variable-gitlab-user-name' into 'master'	Grzegorz Bizon	2017-08-31	4	-3/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Predefined Variable GITLAB_USER_NAME" Closes #26692 See merge request !13824
\| * \| \| \| \| \| \| \| \| \| \|	Add a Build Variable to represent the triggering GitLab user's login username	Mark Fletcher	2017-08-30	4	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Predefined variable represents the username of the GitLab user that started a build
\| * \| \| \| \| \| \| \| \| \| \|	Add a Build Variable to represent the triggering GitLab user's name	Mark Fletcher	2017-08-30	3	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Predefined variable represents the name of the GitLab user that started a build
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'google-protobuf-3.4.0.2' into 'master'	Marin Jankovski	2017-08-31	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use google-protobuf 3.4.0.2 See merge request !13796
\| * \| \| \| \| \| \| \| \| \| \|	Use google-protobuf 3.4.0.2google-protobuf-3.4.0.2	Jacob Vosmaer	2017-08-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-merge-request-version-dropdowns' into 'master'	Phil Hughes	2017-08-31	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make merge request version dropdowns consistent See merge request !13590
\| * \| \| \| \| \| \| \| \| \| \| \|	Make merge request version dropdowns consistentwinh-merge-request-version-dropdowns	winh	2017-08-28	1	-0/+2
\| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-namespace-select-dropdown' into 'master'	Phil Hughes	2017-08-31	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make namespace select dropdowns consistent See merge request !13626
\| * \| \| \| \| \| \| \| \| \| \| \|	Make namespace select dropdowns consistentwinh-namespace-select-dropdown	winh	2017-08-28	1	-0/+2
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-unnecessary-console-log' into 'master'	Phil Hughes	2017-08-31	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove accidental console.log from karma tests See merge request !13936
\| * \| \| \| \| \| \| \| \| \| \| \|	remove accidental console.log from karma testsremove-unnecessary-console-log	Mike Greiling	2017-08-30	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci-skip]
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mk-default-ldap-verify-certificates-secure' into 'master'	Douwe Maan	2017-08-31	4	-18/+18
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default LDAP config verify_certificates to true Closes #33662 See merge request !13915
\| * \| \| \| \| \| \| \| \| \| \| \|	Add changelog entry for flipping verify_certificatesmk-default-ldap-verify-certificates-secure	Michael Kozono	2017-08-30	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Default LDAP config verify_certificates to true	Michael Kozono	2017-08-30	3	-18/+13
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/gb/add-complex-jobs-only-except-config-policy' into ↵	Kamil Trzciński	2017-08-31	17	-152/+330
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' New syntax for CI/CD job triggering policy that supports variables expressions See merge request !13769
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused expressions policy from ci/cd configfeature/gb/add-complex-jobs-only-except-config-policy	Grzegorz Bizon	2017-08-30	2	-39/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Simplify code for appending strategies in CI/CD config	Grzegorz Bizon	2017-08-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Raise exception when simplifiable ci entry incomplete	Grzegorz Bizon	2017-08-30	2	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix rubocop offense in YAML processor specs	Grzegorz Bizon	2017-08-26	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add specs for attributable aspect of ci config entry	Grzegorz Bizon	2017-08-25	2	-6/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix Rubocop offense in CI/CD only/except policy class	Grzegorz Bizon	2017-08-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Improve reporting of a CI/CD entry config location	Grzegorz Bizon	2017-08-25	7	-31/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Simplify ci config entry validator implementation	Grzegorz Bizon	2017-08-25	1	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|