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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Pass before_script and script as-is preserving arrayspass-before-script-as-is	Kamil Trzcinski	2017-07-07	5	-25/+80
\|
*	Merge branch 'foreign-keys-for-project-model' into 'master'	Sean McGivern	2017-07-06	56	-248/+627
\|\ \| \| \| \| \| \| \| \|	Add foreign keys to various tables that point to the "projects" table See merge request !9388
\| *	Rename ActiverecordSerialize cop	Yorick Peterse	2017-07-06	18	-31/+31
\| \| \| \| \| \| \| \| \| \|	This cop has been renamed to ActiveRecordSerialize to match the way "ActiveRecord" is usually written.
\| *	Update CI runner factories to not use invalid IDs	Yorick Peterse	2017-07-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	These IDs point to non-existing rows, causing the foreign key constraints to fail.
\| *	Added Cop to blacklist the use of `dependent:`	Yorick Peterse	2017-07-06	29	-73/+140
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is allowed for existing instances so we don't end up 76 offenses right away, but for new code one should _only_ use this if they _have_ to remove non database data. Even then it's usually better to do this in a service class as this gives you more control over how to remove the data (e.g. in bulk).
\| *	Add many foreign keys to the projects table	Yorick Peterse	2017-07-06	14	-146/+458
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes the need for relying on Rails' "dependent" option for data removal, which is _incredibly_ slow (even when using :delete_all) when deleting large amounts of data. This also ensures data consistency is enforced on DB level and not on application level (something Rails is really bad at). This commit also includes various migrations to add foreign keys to tables that eventually point to "projects" to ensure no rows get orphaned upon removing a project.
* \|	Merge branch '34636-update-prometheus-metrics-library' into 'master'	Tim Zallmann	2017-07-06	1	-18/+68
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update Prometheus Metrics Library See merge request !12621
\| * \|	Add NGINX metrics and other minor changes34636-update-prometheus-metrics-library	Joshua Lambert	2017-07-04	1	-37/+53
\| \| \|
\| * \|	Add ELB metrics	Joshua Lambert	2017-07-03	1	-2/+36
\| \| \|
* \| \|	Merge branch '34698-fix-stubbing-cached-markdown-fields' into 'master'	Rémy Coutable	2017-07-06	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix stubbing attributes alongside cache_markdown_field Closes #34698 See merge request !12661
\| * \|	Fix stubbing attributes alongside cache_markdown_field	Nick Thomas	2017-07-05	1	-1/+1
\| \| \|
* \| \|	Merge branch '33657-user-projects-api' into 'master'	Rémy Coutable	2017-07-06	6	-50/+257
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add user projects API Closes #33657 See merge request !12596
\| * \| \|	Add user projects API	vanadium23	2017-07-06	6	-50/+257
\| \| \| \|
* \| \| \|	Merge branch '34698-fix-transient-failure' into 'master'	Grzegorz Bizon	2017-07-06	1	-8/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a nasty transient failure happening is a subsequent spec Closes #34698 See merge request !12664
\| * \| \| \|	Fix project_path helper arguments in wiki specs34698-fix-transient-failure	Grzegorz Bizon	2017-07-06	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fix Rubocop offenses in gitaly client ref specs	Grzegorz Bizon	2017-07-06	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Fix a nasty transient failure happening is a subsequent spec	Rémy Coutable	2017-07-05	1	-9/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/34698#note_34276286 for the thorough explanation. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'additional-commits-integer-fix' into 'master'	Sean McGivern	2017-07-06	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalid integer value when more than 1000 commits Closes #34711 See merge request !12659
\| * \| \| \| \|	Fix invalid integer value when more than 1000 commitsadditional-commits-integer-fix	Phil Hughes	2017-07-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #34711
* \| \| \| \| \|	Merge branch '33772-readonly-gitlab-ci-cache' into 'master'	Kamil Trzciński	2017-07-06	10	-26/+120
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce cache policies for CI jobs Closes #33772 See merge request !12483
\| * \| \| \| \| \|	Introduce cache policies for CI jobs	Nick Thomas	2017-07-05	10	-26/+120
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'	Grzegorz Bizon	2017-07-06	20	-13/+161
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Project option to allow customizing CI/CD config path" Closes #32815 and #33130 See merge request !12509
\| * \ \ \ \ \	Merge commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55' into ↵32815--Add-Custom-CI-Config-Path	Grzegorz Bizon	2017-07-05	49	-1449/+1061
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	32815--Add-Custom-CI-Config-Path * commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55': Remove IIFEs around several javascript classes Handles realtime with 2 states for environments table Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'" Disable Flipper memoizer in tests to avoid transient failures fix sidebar padding for full-width items (Time Tracking help) Replace 'snippets/snippets.feature' spinach with rspec 32838 Add wells to admin dashboard overview to fix spacing problems
\| * \| \| \| \| \| \|	Use a previous approach for cycle analytics dummy pipeline	Grzegorz Bizon	2017-07-05	2	-4/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-07-05	192	-974/+4252
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	32815--Add-Custom-CI-Config-Path * upstream/master: (149 commits) Revert change to design. Go back to scrollable page Fixes the column widths for the new navigation options in settings Migrate #submodule_url_for to Gitaly Add test example for external commit status retries Fix invalid Rails.logger call in lib/gitlab/health_checks/fs_shards_check.rb Fix build for !12300. Log rescued exceptions to Sentry Fix issues with non-UTF8 filenames by always fixing the encoding of tree and blob paths Revert "Merge branch 'revert-12499' into 'master'" Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion Improve the overall UX for the new monitoring dashboard Document that GitLab 9.3 requires the TRIGGER permission on MySQL Instrument Unicorn with Ruby exporter Remove group modal like remove project modal. Closes #33130 Update prometheus client gem Enables the option in user preferences to turn on the new navigation Add Jasmine tests for `OAuthRememberMe` Simplify authentication logic in the v4 users API for !12445. Use stub_application_setting when testing ApplicationHelper#support_url wait_for_requests is not needed when AJAX is not in play ...
\| * \| \| \| \| \| \|	Rename ci_config_file to ci_config_path	Lin Jen-Shin	2017-07-05	15	-36/+36
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add back Pipeline#ci_yaml_file_path due to all the troubles	Lin Jen-Shin	2017-07-05	7	-39/+37
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix cycle analytics tests by making pipeline valid	Lin Jen-Shin	2017-07-05	1	-1/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make sure we remove null characters	Lin Jen-Shin	2017-07-04	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix config path	Lin Jen-Shin	2017-07-04	3	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Also remove null character	Lin Jen-Shin	2017-07-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Follow feedback on the merge request	Lin Jen-Shin	2017-07-04	6	-40/+41
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix various descriptions given the feedback	Lin Jen-Shin	2017-07-04	5	-8/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Give project to the dummy pipeline	Lin Jen-Shin	2017-07-03	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-07-03	117	-614/+1060
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	32815--Add-Custom-CI-Config-Path * upstream/master: (39 commits) Fix rubocop offenses Make entrypoint and command keys to be array of strings Add issuable-list class to shared mr/issue lists to fix new responsive layout New navigation breadcrumbs Restore timeago translations in renderTimeago. Automatically hide sidebar on smaller screens Fix typo in IssuesFinder comment Remove placeholder note when award emoji slash command is applied Make setSidebarHeight more efficient with SidebarHeightManager. Update CHANGELOG.md for 9.3.3 Resolve "More actions dropdown hidden by end of diff" Use Gitaly 0.14.0 Improve support for external issue references Make issuables_count_for_state public Only verifies top position after the request has finished to account for errors Clarify counter caching for users without project access Make finders responsible for counter cache keys Add changelog entry for issue / MR tab counting optimisations Don't count any confidential issues for non-project-members Cache total issue / MR counts for project by user type ...
\| * \| \| \| \| \| \| \|	We don't need to disable transaction in this case	Lin Jen-Shin	2017-07-01	1	-7/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Introduce CI_CONFIG_PATH	Lin Jen-Shin	2017-06-30	3	-1/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add changelog entry	Lin Jen-Shin	2017-06-30	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update wordings, allow only full path, add tests	Lin Jen-Shin	2017-06-30	7	-38/+49
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-06-30	335	-4880/+13644
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	32815--Add-Custom-CI-Config-Path * upstream/master: (123 commits) Backport changes to Projects::IssuesController and the search bar bugfix: use `require_dependency` to bring in DeclarativePolicy Resolve "Select branch dropdown is too close to branch name" Clean up issuable lists Defer project destroys within a namespace in Groups::DestroyService#async_execute Fixed new navgiation bar logo height in Safari Resolve "Issue dropdown persists when adding issue number to issue description" Move verification to block level instead of paragraph Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'" Added code for defining SHA attributes Minor edits Job details won't scroll horizontally to show long lines Run mysql tests on stable preperation branches like 9-3-stable-patch-2 Bring back branches badge to main project page optimize translation content based on comments supplement traditional chinese in taiwan translation Inserts exact matches of username, email and name to the top of the user search list Remove Namespace model default scope override and write additional test to Project search optimize translation content based on comments Limit OpenGraph image size to 64x64 ...
\| * \| \| \| \| \| \| \| \|	Fix the test and implement missing update	Lin Jen-Shin	2017-06-28	2	-2/+18
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Try to report where the file should be	Lin Jen-Shin	2017-06-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix doc, test, and form	Lin Jen-Shin	2017-06-28	4	-90/+13
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Inline what it was before for the regexp and message	Lin Jen-Shin	2017-06-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵15041-Add-Custom-CI-Config-Path	Lin Jen-Shin	2017-06-28	9734	-129764/+459899
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	15041-Add-Custom-CI-Config-Path * upstream/master: (12506 commits) Update CHANGELOG.md for 9.3.2 Update architecture.md Fix changelog entry file extension Fix head pipeline stored in merge request for external pipelines updated gitlab-ci.yml to compile locale Ignore JSON files generated from PO files Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses method that is no longer part of Ruby API Disable rainbow during SimpleExecutor specs to have consistence Slightly refactor pipeline schedules form in preparation for additions Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page" Make the SimpleExecutor rescue exceptions in the executing Checks Resolve "Unable to access edit comment from dropdown menu in certain screen sizes" Update changelog item revert removal of requestAnimationFrame and move to a separate MR/discussion rename getEmojiCategoryMap and remove unnecessary parameter Action Buttons on Prio Labels working again by setting pointer events to none on… Remove 'contains' option from Commit.find_all Remove Gitlab::Git::Repository#find_all Use latest chrome and chrome driver in GitLab QA Polish sidebar toggle ...
\| * \| \| \| \| \| \| \| \| \|	Add config option to project to allow custom .gitlab-ci.yml location	Keith Pope	2016-10-08	13	-3/+147
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-static-analysis' into 'master'	Robert Speicher	2017-07-05	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Rubocop offense See merge request !12665
\| * \| \| \| \| \| \| \| \| \| \|	Fix Rubocop offensefix-static-analysis	Rémy Coutable	2017-07-05	1	-2/+2
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'synchronize_changes_in_community_translation_of_msgid' into ↵	Douwe Maan	2017-07-05	7	-11/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Synchronize changes in community translation of msgid See merge request !12646
\| * \| \| \| \| \| \| \| \| \| \|	synchronize changes in community translation of msgid	黄涛	2017-07-05	7	-11/+11
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|