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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| *	Add support for cross project references for labels	Grzegorz Bizon	2016-03-03	1	-0/+19
\| \| \|
\| \| *	Add support for keyword arguments in label reference method	Grzegorz Bizon	2016-03-03	1	-1/+1
\| \| \|
\| * \|	Merge branch 'rs-frontmatter-pre' into 'master'	Robert Speicher	2016-03-05	1	-0/+53
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly display YAML front matter in Markdown See merge request !3072
\| \| * \|	Add YamlFrontMatterFilter to the PreProcessPipeline	Robert Speicher	2016-03-04	1	-0/+53
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	This filter will detect YAML Front Matter and convert it to an HTML table for prettier formatting.
\| * \|	Merge branch 'rs-wiki-pipeline-spec' into 'master'	Douwe Maan	2016-03-04	2	-44/+60
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a spec for WikiPipeline Removes the specs from GollumTagsFilter that were more like integration tests for the pipeline than unit tests of the filter. See merge request !3054
\| \| * \|	Replace `[[_TOC_]]` tag even if `toc` result is blankrs-wiki-pipeline-spec	Robert Speicher	2016-03-03	2	-3/+3
\| \| \| \|
\| \| * \|	Add a spec for WikiPipeline	Robert Speicher	2016-03-01	2	-44/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes the specs from GollumTagsFilter that were more like integration tests for the pipeline than unit tests of the filter.
\| * \| \|	Use Gitlab::Git::DiffCollections	Jacob Vosmaer	2016-03-03	2	-2/+2
\| \| \|/ \| \|/\|
* \| \|	refactored a bunch of stuff based on MR feedback	James Lopez	2016-03-07	1	-0/+13
\| \| \|
* \| \|	fix specs	James Lopez	2016-03-04	2	-4/+9
\| \| \|
* \| \|	some refactoring in the migration. Also fixed github import issue and ↵	James Lopez	2016-03-04	1	-1/+2
\|/ / \| \| \| \| \| \|	updated spec
* \|	Add FilterArray class to Banzairs-filter-array	Robert Speicher	2016-03-01	1	-0/+39
\|/
*	Merge branch 'rs-wiki-toc' into 'master'	Douwe Maan	2016-03-01	1	-0/+52
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilter Closes #2494 See merge request !2952
\| *	Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilterrs-wiki-toc	Robert Speicher	2016-02-23	1	-0/+52
\| \| \| \| \| \| \| \|	Closes #2494
* \|	Merge branch 'rs-data-links' into 'master'	Douwe Maan	2016-02-29	1	-1/+15
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize `data` and `vbscript` links Closes #13625 Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660 See merge request !2905
\| *	Sanitize `vbscript:` linksrs-data-links	Robert Speicher	2016-02-23	1	-0/+7
\| \| \| \| \| \| \| \|	Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660
\| *	Sanitize `data:` links	Robert Speicher	2016-02-21	1	-1/+8
\| \| \| \| \| \| \| \|	Closes #13625
* \|	Extend specs for summary build statusci/extend-summary-status-specs	Grzegorz Bizon	2016-02-20	1	-21/+51
\|/ \| \| \| \| \| \|	Additional specs cover a case when one of the builds is running but allowed to fail. Previous implementation returned `running` status, which is wrong. This behavior has been changed in 8.5, this commit adds missing specs.
*	Merge branch 'commit-status-fix' into 'master'	Kamil Trzciński	2016-02-19	1	-25/+29
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing ignored? for GenericCommitStatus This is pretty important fix. We should not release 8.5 without this. It critical error when handling GenericCommitStatus: ``` undefined method `ignored?' for #<GenericCommitStatus:0x007fe1a2a20fe0> ``` cc @grzesiek See merge request !2899
\| *	Fix missing ignored? for GenericCommitStatuscommit-status-fix	Kamil Trzcinski	2016-02-19	1	-25/+29
\| \|
* \|	Merge branch 'saml-decoupling' into 'master'	Patricio Cano	2016-02-19	2	-3/+294
\|\ \ \| \|/ \|/\|
\| *	Make new `allow_single_sign_on` feature backwards compatible	Patricio Cano	2016-02-18	2	-3/+23
\| \|
\| *	Decouple SAML authentication from the default Omniauth logic	Patricio Cano	2016-02-18	2	-3/+274
\| \|
* \|	Merge branch 'rs-emoji' into 'master'	Douwe Maan	2016-02-19	1	-2/+2
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Update Gemojione for new hotness :sparkles: Before \| After ------ \| ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) \| ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
\| *	Fix specs expecting `emoji/` in image path	Robert Speicher	2016-02-13	1	-2/+2
\| \|
* \|	Revert "Merge branch 'saml-decoupling' into 'master' "	Douwe Maan	2016-02-18	2	-274/+3
\| \| \| \| \| \| \| \| \| \|	This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
* \|	Decouple SAML authentication from the default Omniauth logic	Patricio Cano	2016-02-18	2	-3/+274
\| \|
* \|	Fix builds scheduler when first build is allowed to fail	Grzegorz Bizon	2016-02-18	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this fix when there was only one relevant, previous build and it failed, but was allowed to fail, entire build had been marked as skipped. Closes #3192
* \|	Add specs for build status helper class	Grzegorz Bizon	2016-02-18	1	-0/+17
\| \|
* \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵git-archive-refactor	Jacob Vosmaer	2016-02-17	1	-9/+12
\|\ \ \| \| \| \| \| \| \| \| \|	git-archive-refactor
\| * \	Merge branch 'rs-issue-13469' into 'master'	Douwe Maan	2016-02-17	1	-9/+12
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle nil commits in Gitlab::PushDataBuilder.build Closes #13469 See merge request !2825
\| \| * \|	Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469	Robert Speicher	2016-02-15	1	-9/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13469
* \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Jacob Vosmaer	2016-02-17	8	-47/+159
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \|	git-archive-refactor
\| * \| \|	Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master'	Douwe Maan	2016-02-16	2	-9/+27
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new data to project in push, issue, merge-request and note webhooks data _Originally opened at !2738 by @bugagazavr._ - - - What does this MR do? Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks ) Are there points in the code the reviewer needs to double check? 1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738 2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132 3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52 4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56 Why was this MR needed? More information about user for push events, and more data about repositiry ( project ) What are the relevant issue numbers? No Screenshots (if relevant) No See merge request !2788
\| \| * \| \|	Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooks	Kirill Zaitsev	2016-02-11	2	-9/+27
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead
\| * \| \|	Fix undefined method `postgresql?` during migrationrs-gitlab-database-module	Robert Speicher	2016-02-15	1	-0/+32
\| \| \|/ \| \|/\|
\| * \|	Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docs	Ben Boeckel	2016-02-12	1	-16/+0
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
\| *	Merge remote-tracking branch 'origin/rs-database-info'	Dmitriy Zaporozhets	2016-02-04	1	-0/+20
\| \|\
\| \| *	Display database type and version in Administration dashboardrs-database-info	Robert Speicher	2016-02-02	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #12900
\| * \|	Make Pipelines responsible for defining their custom whitelistrs-whitelist-in-pipeline	Robert Speicher	2016-02-03	2	-22/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows for future pipelines to more easily define a custom whitelist.
\| * \|	Support Akismet spam checking for creation of issues via API	Stan Hu	2016-02-02	1	-0/+35
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
\| *	Allow "@" in file names and pathallow-@	Jacob Vosmaer	2016-02-01	1	-0/+8
\| \|
* \|	First version of "git archive" headers	Jacob Vosmaer	2016-02-02	1	-0/+18
\|/
*	Merge branch 'rename-inline-diff' into 'master'	Robert Speicher	2016-01-31	3	-26/+89
\|\ \| \| \| \| \| \| \| \|	Mark inline difference between old and new paths when a file is renamed See merge request !2652
\| *	Fix specs and add a new one	Douwe Maan	2016-01-30	1	-24/+24
\| \|
\| *	Mark inline difference between old and new paths when a file is renamed	Douwe Maan	2016-01-29	3	-27/+90
\| \|
* \|	Increase the minimum length for commit SHA matching to 7rs-issue-12706	Robert Speicher	2016-01-29	1	-2/+2
\|/ \| \| \| \| \|	This is the git default and will help to prevent false positive matches. Closes #12706
*	Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blocking	Robert Speicher	2016-01-28	1	-68/+0
\| \| \| \| \|	This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
*	Move blame group logic to dedicated class	Douwe Maan	2016-01-28	1	-0/+24
\|
*	Update ExternalIssue regex for JIRA integration	Blake Hitchcock	2016-01-26	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|	The pattern in the `::reference_pattern` class method in the ExternalIssue model does not match all valid forms of JIRA project names. I have updated the regex to match JIRA project names with numbers and underscores. More information on valid JIRA project names can be found here: https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html * The first character must be a letter, * All letters used in the project key must be from the Modern Roman Alphabet and upper case, and * Only letters, numbers or the underscore character can be used.