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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Support uploaders for personal snippets comments12910-uploader-pers-snippet	Jarka Kadlecova	2017-05-02	1	-0/+87
\|
*	Merge branch 'enable-spec-file-name-cop' into 'master'	Robert Speicher	2017-04-28	4	-67/+51
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Enable RSpec/FilePath cop Closes #31316 See merge request !10911
\| *	Enable RSpec/FilePath copenable-spec-file-name-cop	Sean McGivern	2017-04-26	4	-67/+51
\| \| \| \| \| \| \| \| \| \| \| \|	- Ignore JS fixtures - Ignore qa directory - Rewrite concern specs to put concern name first
* \|	Merge branch 'dz-add-oauth-controller-spec' into 'master'	Rémy Coutable	2017-04-28	1	-0/+55
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add tests for Oauth::AuthorizationsController See merge request !10982
\| * \|	Add tests for Oauth::AuthorizationsControllerdz-add-oauth-controller-spec	Dmitriy Zaporozhets	2017-04-28	1	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"	Dosuken shinya	2017-04-28	1	-12/+354
\| \| \|
* \| \|	Merge branch '31138-improve-test-settings-for-services-in-empty-projects' ↵	Douwe Maan	2017-04-27	1	-4/+45
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' improves test settings for chat notification services for empty projects Closes #31138 See merge request !10886
\| * \|	improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projects	Tiago Botelho	2017-04-27	1	-4/+45
\| \| \|
* \| \|	Merge branch '12910-personal-snippet-prep-2' into 'master'	Sean McGivern	2017-04-26	3	-0/+38
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Support preview_markdown action for personal_snippets See merge request !10810
\| * \|	Support preview_markdown action for personal_snippets	Jarka Kadlecova	2017-04-26	3	-0/+38
\| \| \|
* \| \|	Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master'	Sean McGivern	2017-04-24	1	-0/+15
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in loading namespaces for every issuable in milestones See merge request !10871
\| * \| \|	Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-url	Stan Hu	2017-04-24	1	-0/+15
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'	Rémy Coutable	2017-04-24	6	-12/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !10567 Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Unnecessary "include WaitForAjax" and "include ApiHelpers"	Jacopo	2017-04-21	7	-14/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs. Removed unnecessary usage of `api:true`
* \| \| \|	Merge branch 'dz-fix-spec-filenames-ce' into 'master'	Sean McGivern	2017-04-24	2	-47/+40
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix incorrect spec filenames which were ingored by CI See merge request !10875
\| * \| \|	Fix incorrect spec filenames which were ingored by CIdz-fix-spec-filenames-ce	Dmitriy Zaporozhets	2017-04-24	2	-47/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Refactor add_users method for project and groupdz-cleanup-add-users	Dmitriy Zaporozhets	2017-04-21	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Refactor Admin::GroupsController#members_update method and add some specsdz-refactor-admin-group-members	Dmitriy Zaporozhets	2017-04-20	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'dz-refactor-create-members' into 'master'	Douwe Maan	2017-04-20	1	-2/+2
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Refactor code that creates and destroys project/group members See merge request !10735
\| * \|	Refactor members controller destroy action	Dmitriy Zaporozhets	2017-04-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Refactor controller code that creates project/group members	Dmitriy Zaporozhets	2017-04-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Refactor changing files in web UI	Douwe Maan	2017-04-20	2	-7/+7
\| \| \|
* \| \|	Merge branch 'usage-ping-port' into 'master'	Sean McGivern	2017-04-19	2	-1/+46
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Usage ping port Closes #27750 See merge request !10481
\| * \|	Add a new Gitlab::UserActivities class to track user activities	Rémy Coutable	2017-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This new class uses a Redis Hash instead of a Sorted Set. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Remove user activities table and use redis instead of PG for recording ↵	James Lopez	2017-04-14	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	activities Refactored specs and added a post deployment migration to remove the activity users table.
\| * \|	Add user activity service and spec. Also added relevant - NOT offline - ↵	James Lopez	2017-04-14	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	migration It uses a user activity table instead of a column in users. Tested with mySQL and postgreSQL
\| * \|	Port 'Add more usage data to EE ping' to CE	Sean McGivern	2017-04-14	1	-0/+37
\| \|/ \| \| \| \| \| \|	CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/735
* \|	Review changes, used eq instead of matchuse-favicon-full-path-for-pipeline-status-favicon	Luke "Jared" Bennett	2017-04-17	3	-3/+3
\| \|
* \|	Updated specs	Luke "Jared" Bennett	2017-04-13	3	-3/+3
\|/
*	Merge branch 'master' into new-resolvable-discussion	Luke "Jared" Bennett	2017-04-07	3	-0/+45
\|\
\| *	Merge branch 'optimise-builds' into 'master'	Sean McGivern	2017-04-07	1	-0/+33
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimise Pipelines > Jobs index controller Closes #27389 See merge request !10546
\| \| *	Count number of queries	Kamil Trzcinski	2017-04-07	1	-0/+33
\| \| \|
\| * \|	Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master'	Douwe Maan	2017-04-07	2	-0/+12
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Protected Tags Closes #18471 See merge request !10356
\| \| *	Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'	Kushal Pandya	2017-04-06	3	-9/+359
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/lib/gitlab/import_export/all_models.yml
\| \| * \|	Protected Tags backend review changes	James Edwards-Jones	2017-04-06	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Added changelog
\| \| * \|	Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'	Kushal Pandya	2017-04-06	16	-27/+516
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss
\| \| * \| \|	Clean up non TODO rubocop errors	James Edwards-Jones	2017-04-03	1	-6/+6
\| \| \| \| \|
\| \| * \| \|	Protected tags copy/paste from protected branches	James Edwards-Jones	2017-03-31	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Should provide basic CRUD backend for frontend to work from. Doesn’t include frontend, API, or the internal API used from gitlab-shell
* \| \| \| \|	Merge branch 'master' into new-resolvable-discussion	Luke "Jared" Bennett	2017-04-07	1	-0/+96
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Add /-/readiness /-/liveness and /-/health_metrics endpoints to track ↵	Paweł Chojnacki	2017-04-07	1	-0/+96
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	application readiness
* \| \| \|	Merge branch 'master' into new-resolvable-discussion	Douwe Maan	2017-04-06	3	-9/+359
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml
\| * \| \|	Merge branch 'feature/multi-level-container-registry-images' into 'master'	Kamil Trzciński	2017-04-06	1	-0/+84
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Multi-level container registry images Closes #17801 See merge request !10109
\| \| * \ \	Merge branch 'master' into feature/multi-level-container-registry-images	Grzegorz Bizon	2017-04-06	6	-1/+171
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (94 commits) Merge branch 'open-redirect-fix-continue-to' into 'security' Merge branch 'open-redirect-host-fix' into 'security' Merge branch 'path-disclosure-proj-import-export' into 'security' Merge branch '29364-private-projects-mr-fix' Merge branch '30125-markdown-security' Issue title realtime Update CHANGELOG.md for 8.16.9 Update CHANGELOG.md for 8.17.5 Update CHANGELOG.md for 9.0.4 Add "search" optional param and docs for V4 Use PDFLab to render PDFs in GitLab Separate Scala from Java in CI examples Fix broken link Reorganize CI examples, add more links Refactor CI index page Remove deprecated field from workhorse response Use gitlab-workhorse 1.4.3 Document how ETag caching middleware handles query parameters Make group skip validation in the frontend Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware ...
\| \| * \| \|	Merge branch 'master' into feature/multi-level-container-registry-images	Grzegorz Bizon	2017-04-04	3	-1/+33
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (57 commits) Ensure we generate unique usernames otherwise validations fail Fix a Knapsack issue that would load support/capybara.rb before support/env.rb Ensure users have a short username otherwise a click event is triggered ... Enable the `bullet_logger` setting; enable `raise` in test environment Fix Rubocop offenses Set the right timeout for Gitlab::Shell#fetch_remote Refactoring Projects::ImportService Move methods that are not related to mirroring to the repository model Fix GitHub pull request formatter spec Rename skip_metrics to imported on the importable concern Add CHANGELOG Remove unused include from RepositoryImportWorker Skip MR metrics when importing projects from GitHub Fetch GitHub project as a mirror to get all refs at once Make file templates easy to use and discover Ensure user has a unique username otherwise `user10` would match `user1` Ensure the AbuseReport fixtures create unique reported users Don't use FFaker in factories, use sequences instead Fix brittle specs Fix the AbuseReport seeder ... Conflicts: db/schema.rb
\| \| * \| \| \|	Fix container registry controller specs	Grzegorz Bizon	2017-04-04	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Refactor container registry repository tag stubs	Grzegorz Bizon	2017-04-03	1	-3/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Ensure root container repository when visiting registry	Grzegorz Bizon	2017-04-03	1	-0/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Root container repository is a images repository that had been created before 9.1, before we introduced multi-level images support.
\| * \| \| \| \|	Linking to edit file directly	Eric Eastwood	2017-04-06	1	-7/+76
\| \| \| \| \| \|
\| * \| \| \| \|	rename cache db column with `_cached` suffix	Alexis Reigel	2017-04-06	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Rename skip_tfa session variable to skip_two_factor	Markus Koller	2017-04-06	1	-1/+1
\| \| \| \| \| \|