Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | Define utility functions later, feedback: | Lin Jen-Shin | 2016-08-05 | 1 | -10/+10 | |
| * | | | | | | | | | | | | | | Share nothing so it's safest, feedback: | Lin Jen-Shin | 2016-08-05 | 1 | -2/+5 | |
| * | | | | | | | | | | | | | | Touch it after builds were created, aligning with: | Lin Jen-Shin | 2016-08-05 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Removed the abstract let, feedback: | Lin Jen-Shin | 2016-08-05 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | Missed renaming them | Lin Jen-Shin | 2016-08-05 | 1 | -5/+7 | |
| * | | | | | | | | | | | | | | Move those builders to their own namespace, feedback: | Lin Jen-Shin | 2016-08-04 | 28 | -44/+79 | |
| * | | | | | | | | | | | | | | Separate the concern for executing hooks and updating states | Lin Jen-Shin | 2016-08-04 | 1 | -4/+12 | |
| * | | | | | | | | | | | | | | Revert "We don't have to touch it because builds would touch pipeline anyway" | Lin Jen-Shin | 2016-08-04 | 2 | -0/+11 | |
| * | | | | | | | | | | | | | | If we use Rails magic it's breaking this test: | Lin Jen-Shin | 2016-08-04 | 2 | -7/+5 | |
| * | | | | | | | | | | | | | | I was too used to this style... | Lin Jen-Shin | 2016-08-04 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Test against the status in the payload | Lin Jen-Shin | 2016-08-03 | 1 | -1/+9 | |
| * | | | | | | | | | | | | | | Make sure we only fire hooks upon status changed | Lin Jen-Shin | 2016-08-03 | 2 | -4/+24 | |
| * | | | | | | | | | | | | | | We don't have to touch it because builds would touch pipeline anyway | Lin Jen-Shin | 2016-08-03 | 2 | -11/+0 | |
| * | | | | | | | | | | | | | | More descriptive comments, feedback: | Lin Jen-Shin | 2016-08-03 | 1 | -2/+6 | |
| * | | | | | | | | | | | | | | Use when instead of if, feedback: | Lin Jen-Shin | 2016-08-03 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | Introduce execute_hooks_unless_ci_skipped | Lin Jen-Shin | 2016-08-03 | 1 | -3/+6 | |
| * | | | | | | | | | | | | | | Implement pipeline hooks, extracted from !5525 | Lin Jen-Shin | 2016-08-02 | 19 | -18/+210 | |
* | | | | | | | | | | | | | | | Merge branch 'file-content-highlight-line' into 'master' | Jacob Schatz | 2016-08-16 | 4 | -8/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fixed wrapping of lines on smaller viewportsfile-content-highlight-line | Phil Hughes | 2016-07-20 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | Uses white-space instead of setting font size to 0 | Phil Hughes | 2016-07-20 | 1 | -5/+3 | |
| * | | | | | | | | | | | | | | Highlight empty lines | Phil Hughes | 2016-07-20 | 4 | -6/+12 | |
* | | | | | | | | | | | | | | | Merge branch 'issue_18656' into 'master' | Douwe Maan | 2016-08-16 | 33 | -106/+875 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Load issues and merge requests templates from repository | Felipe Artur | 2016-08-16 | 33 | -106/+875 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'ee-581-backport-changes' into 'master' | Douwe Maan | 2016-08-16 | 21 | -109/+137 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changes | Timothy Andrew | 2016-08-16 | 15 | -215/+229 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'dev/master' | Ruben Davila | 2016-08-16 | 10 | -51/+81 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fix/export-att-inclusion' into 'master' | Douwe Maan | 2016-08-15 | 4 | -7/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | refactor parse_hash based on feedback | James Lopez | 2016-08-11 | 1 | -3/+3 | |
| | * | | | | | | | | | | | | | | | Fix attribute inclusion in import/export config ignored in some cases | James Lopez | 2016-08-11 | 4 | -7/+12 | |
| * | | | | | | | | | | | | | | | | Merge branch 'fix/import-permissions' into 'master' | Douwe Maan | 2016-08-15 | 6 | -44/+69 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Fix permissions check in controller, added relevant spec and updated docs | James Lopez | 2016-08-11 | 6 | -44/+69 | |
| | |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'document-when-to-add-indexes' into 'master' | Achilleas Pipinellis | 2016-08-16 | 2 | -0/+127 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Added documentation on adding database indexesdocument-when-to-add-indexes | Yorick Peterse | 2016-08-11 | 2 | -0/+127 | |
* | | | | | | | | | | | | | | | | | | Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-lin... | Rubén Dávila Santos | 2016-08-16 | 2 | -159/+10 | |
* | | | | | | | | | | | | | | | | | | Merge branch '19350-product-map' into 'master' | Jacob Schatz | 2016-08-16 | 1 | -5/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Add reference to product map. 19350-product-map | Chris Peressini | 2016-08-11 | 1 | -5/+11 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | Backport EE assertions in protected branch related specs. | Timothy Andrew | 2016-08-16 | 2 | -10/+10 | |
| | | | * | | | | | | | | | | | | | | Fix a missed `before_action` for `AutocompleteController`. | Timothy Andrew | 2016-08-16 | 1 | -0/+1 | |
| | | | * | | | | | | | | | | | | | | Backport `AutocompleteController#load_project` from EE!581. | Timothy Andrew | 2016-08-16 | 1 | -5/+12 | |
| | | | * | | | | | | | | | | | | | | Fix API::BranchesSpec. | Timothy Andrew | 2016-08-16 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | Fix failing tests relating to backporting ee!581. | Timothy Andrew | 2016-08-16 | 4 | -20/+25 | |
| | | | * | | | | | | | | | | | | | | Fix the protected branches factory. | Timothy Andrew | 2016-08-16 | 1 | -3/+3 | |
| | | | * | | | | | | | | | | | | | | Improve EE compatibility with protected branch access levels. | Timothy Andrew | 2016-08-16 | 3 | -7/+9 | |
| | | | * | | | | | | | | | | | | | | Move the "update" portion of the protected branch view into a partial. | Timothy Andrew | 2016-08-16 | 2 | -10/+13 | |
| | | | * | | | | | | | | | | | | | | Don't select an access level if already selected. | Timothy Andrew | 2016-08-16 | 1 | -4/+12 | |
| | | | * | | | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!581 to CE. | Timothy Andrew | 2016-08-16 | 14 | -70/+72 | |
| |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'cs-upgrade-httpclient' into 'master' | Stan Hu | 2016-08-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Upgrade httpclient gem from 2.7.0.1 to 2.8.2. | Connor Shea | 2016-08-15 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'akismet-submittable' into 'master' | Robert Speicher | 2016-08-15 | 35 | -159/+583 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Further refactor and syntax fixes. | Patricio Cano | 2016-08-15 | 20 | -169/+160 |