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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'update-vue-docs' into 'master'	Stan Hu	2017-08-15	1	-0/+17
\|\ \| \| \| \| \| \| \| \|	Update docs with Javascript accord. See merge request !13440
\| *	Update docs with Javascript accord.	Jacob Schatz	2017-08-15	1	-0/+17
\|/
*	Merge branch 'repo-fixes-e' into 'master'	Jacob Schatz	2017-08-14	15	-116/+149
\|\ \| \| \| \| \| \| \| \|	Repo fixes part E See merge request !13472
\| *	Add shared getFileExtension helper methodrepo-fixes-e	Eric Eastwood	2017-08-14	2	-2/+7
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146854
\| *	Remove unused repo store keys	Eric Eastwood	2017-08-14	2	-17/+1
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37147332
\| *	Add comment about why we need to stop parsing JSON	Eric Eastwood	2017-08-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146815 See https://gitlab.slack.com/archives/C0GQHHPGW/p1501779964878178
\| *	Use single js- wrapper class to show/hide	Eric Eastwood	2017-08-14	4	-8/+10
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146360
\| *	Scroll total scroll width instead of fixed value	Eric Eastwood	2017-08-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed value could potentially be not enough Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145886
\| *	Switch single fa icon generation to inline	Eric Eastwood	2017-08-14	1	-5/+1
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145729
\| *	Remove duplicate setting of variable	Eric Eastwood	2017-08-14	1	-1/+0
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145640
\| *	Reset monacoLoading on failure	Eric Eastwood	2017-08-14	1	-1/+4
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37144070
\| *	Remove overflow tabs logic (no longer used)	Eric Eastwood	2017-08-14	3	-26/+3
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143794
\| *	Remove loading state from repo_tab	Eric Eastwood	2017-08-14	2	-23/+8
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143710
\| *	Make close/changed icon more accessible	Eric Eastwood	2017-08-14	1	-2/+17
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143527
\| *	Use promise syntax with Helper.getContent	Eric Eastwood	2017-08-14	3	-12/+13
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143217
\| *	Split out linkClicked and add tests	Eric Eastwood	2017-08-14	2	-24/+69
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143174
\| *	Use v-else instead of duplicating logic	Eric Eastwood	2017-08-14	2	-4/+18
\| \| \| \| \| \| \| \| \| \|	Fix http://192.168.1.135:3000/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/broadcast_message.js
\| *	Move syntax highlighting into a method	Eric Eastwood	2017-08-10	1	-2/+8
\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37142936
* \|	Merge branch 'bvl-use-no-wrap-for-pot-file' into 'master'	Rubén Dávila	2017-08-14	17	-221/+167
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove newlines in translations See merge request !13531
\| * \|	Remove `\n` from translationsbvl-use-no-wrap-for-pot-file	Bob Van Landuyt	2017-08-14	17	-221/+167
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They seem to confuse some translation tools and aren't rendered in HTML anyway.
* \| \|	Merge branch '36378-error-raising-expectation-in-spec-fix' into 'master'	Robert Speicher	2017-08-14	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix positive raise_error expectation without specifying the error type expected… Closes #36378 See merge request !13542
\| * \| \|	Fix positive raise_error expectation without specifying the error type ↵36378-error-raising-expectation-in-spec-fix	Tiago Botelho	2017-08-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	expected in Project::DestroyService specs
* \| \| \|	Merge branch '35804-document-table-based-tests' into 'master'	Robert Speicher	2017-08-14	4	-0/+72
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use rspec-parameterized for table-based tests Closes #35804 See merge request !13469
\| * \| \| \|	Use rspec-parameterized for table-based tests	Nick Thomas	2017-08-11	4	-0/+72
\| \| \| \| \|
* \| \| \| \|	Merge branch '36385-pipeline-graph-dropdown' into 'master'	Phil Hughes	2017-08-14	2	-0/+26
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stops propagation for dropdown content in pipeline graph. Closes #36385 See merge request !13536
\| * \| \| \| \|	Stops propagation for dropdown content in pipeline graph. Applies the same ↵36385-pipeline-graph-dropdown	Filipa Lacerda	2017-08-14	2	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	behavior of the mini graph
* \| \| \| \| \|	Merge branch ↵	Clement Ho	2017-08-14	14	-78/+83
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master' Resolve "Make edit comment button always available outside of dropdown" Closes #34527 See merge request !12931
\| * \| \| \| \| \|	take edit note button out of dropdown34527-make-edit-comment-button-always-available-outside-of-dropdown	Simon Knox	2017-08-10	14	-78/+83
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '7-days-cycle-analytics' into 'master'	Rémy Coutable	2017-08-14	4	-1/+54
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a `Last 7 days` option for Cycle Analytics view Closes #36300 See merge request !13443
\| * \| \| \| \| \| \|	Add a `Last 7 days` option for Cycle Analytics view	Mehdi Lahmam	2017-08-11	4	-1/+30
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add feature specs for Cycle Analytics pipeline summary	Mehdi Lahmam	2017-08-11	1	-0/+24
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rs-remove-username-from-sanitize-attrs' into 'master'	Rémy Coutable	2017-08-14	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `username` from `User#sanitize_attrs` callback See merge request !13511
\| * \| \| \| \| \| \| \|	Remove `username` from `User#sanitize_attrs` callbackrs-remove-username-from-sanitize-attrs	Robert Speicher	2017-08-11	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This attribute is since validated against `DynamicPathValidator`, which has strict requirements for the characters allowed, and should no longer need to be sanitized in a callback before saving. This has additional benefits in our test suite, where every creation of a `User` record was calling `Sanitize.clean` on a username value that was always clean, since we're the ones generating it.
* \| \| \| \| \| \| \| \|	Merge branch '36404-do-not-run-flaky-examples-check-for-docs-changes' into ↵	Robert Speicher	2017-08-14	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Don't run the `flaky-examples-check` job for docs branches Closes #36404 See merge request !13525
\| * \| \| \| \| \| \| \| \|	Don't run the `flaky-examples-check` job for docs branches36404-do-not-run-flaky-examples-check-for-docs-changes	Rémy Coutable	2017-08-14	1	-0/+1
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'gitaly-test-bundle-path' into 'master'	Rémy Coutable	2017-08-14	2	-7/+22
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use existing BUNDLE_PATH for gitaly in local tests See merge request !13493
\| * \| \| \| \| \| \| \| \|	Use existing BUNDLE_PATH for gitaly in local testsgitaly-test-bundle-path	Jacob Vosmaer	2017-08-11	2	-7/+22
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '36236-auto-detect-metrics-for-auto-deployed-environments' into ↵	Rémy Coutable	2017-08-14	6	-15/+69
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Improve Prometheus docs, include nginx ingress Closes #36236 See merge request !13438
\| * \| \| \| \| \| \| \| \| \|	Improve Prometheus docs, include nginx ingress	Joshua Lambert	2017-08-14	6	-15/+69
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '36089-handle-ref-failure-better' into 'master'	Douwe Maan	2017-08-14	22	-162/+223
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor how we fetch ref for merge requests Closes #36089 and #36296 See merge request !13416
\| * \| \| \| \| \| \| \| \| \|	Use with_repo_branch_commit instead of fetch_ref directly	Lin Jen-Shin	2017-08-14	2	-11/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So that we could limit the access to Repository#fetch_ref See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13416#note_37487433
\| * \| \| \| \| \| \| \| \| \|	Add comments about why we're stubbing them36089-handle-ref-failure-better	Lin Jen-Shin	2017-08-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-08-14	177	-1081/+3756
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36089-handle-ref-failure-better * upstream/master: (47 commits) Update CHANGELOG.md for 9.4.5 Update charlock_holmes add a changelog entry switch to multi-line before block restructure the #new_key notification spec don't send devise notifications to the ghost user reset_delivered_emails before testing #new_key skip the :read_project check for new_project_member move the member spec to be with the other ones add a spec for new_group_member add a spec for never emailing the ghost user rubocop fix a membership with no user is always notifiable check notifiability for more emails add Member#notifiable?(type, opts) make NotificationRecipient a little more customizable Add notes about database performance for MySQL fix confidential border issue as well as confidential styles leaking on new MR Migrate force push check to Gitaly Add option to disable project export on instance ...
\| * \| \| \| \| \| \| \| \| \| \|	Skip creating the merge request if repo is empty	Lin Jen-Shin	2017-08-11	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-08-11	63	-98/+107
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36089-handle-ref-failure-better * upstream/master: Fix merge request diff deserialisation when too_large was absent Bumps omniauth-ldap gem version to 2.0.4 Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rb Remove documentation about rules that are now enforced by RuboCop Enable the RSpec/HookArgument cop and auto-correct offenses
\| * \| \| \| \| \| \| \| \| \| \| \|	Just use repository would fix the test	Lin Jen-Shin	2017-08-11	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Since now fetch_ref is reliable, we could just rely on it	Lin Jen-Shin	2017-08-11	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Just use the repo. Not sure why master could pass	Lin Jen-Shin	2017-08-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It keeps giving me no repo error from setting up autocrlf, which shouldn't have anything to do with this merge request.
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-08-11	187	-802/+1399
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36089-handle-ref-failure-better * upstream/master: (62 commits) Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb. Docs: update user docs index Fix minor typos in views Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_spec Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4' Merge branch 'import-symlinks-9-3' into 'security-9-3' Fix wrong method call on prometheus histogram Document new all-in-one Helm chart - docs Fix 404 on link path Fix line numbers not matching up to code in code viewer. Hide overflow-x on collapsed sidebar removed global use of breakpoint checker Increase performance of the breakpoint size checker Filter sensitive query string parameters from NGINX access logs Added a template for database changes Render new issue link in failed job as a regular link instead of a UJS one Include RE2 in the upgrade docs Remove affix plugin from issuable sidebar with new navigation Fix linter error alternative route for download archive ...
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix more tests	Lin Jen-Shin	2017-08-11	7	-119/+120
\| \| \| \| \| \| \| \| \| \| \| \| \| \|