summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explicitly call script with bash for consistency simpler than telling users to set script executable [ci skip] See merge request !2621
| * | | | | | | | | | | | | | | explicitly call script with bash for consistencyMike Chelen2016-01-271-2/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'update-newrelic-gem' into 'master' Dmitriy Zaporozhets2016-02-023-8/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump New Relic gem version to avoid warnings in Web page This version has support for Grape, so we should consider removing the newrelic-grape gem as well: https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation See merge request !2578
| * | | | | | | | | | | | | | | | Remove newrelic_grape gem since the New Relic gem now provides native support:Stan Hu2016-01-302-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation
| * | | | | | | | | | | | | | | | Bump New Relic gem version to avoid warnings in Web pageStan Hu2016-01-303-3/+4
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'Michi302/gitlab-ce-fix/pagination-links' into 'master' Dmitriy Zaporozhets2016-02-023-8/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix add_pagination_headers to keep request parameters in Link header Originally opened at !2321. Closes #5904. /cc @Michi302 See merge request !2674
| * | | | | | | | | | | | | | | | Add a spec for the API pagination Link headerRémy Coutable2016-02-021-3/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix add_pagination_headers to keep request parameters in Link headerMichi3022016-02-022-5/+16
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'contributing-labels-stable-releases' into 'master' Robert Speicher2016-02-021-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated contributing guide for stable releases [ci skip] See merge request !2638
| * | | | | | | | | | | | | | | | Updated contributing guide for stable releasescontributing-labels-stable-releasesYorick Peterse2016-02-021-0/+12
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12784
* | | | | | | | | | | | | | | | Merge branch 'lazy-blobs' into 'master' Jacob Vosmaer2016-02-028-6/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy Git blobs To prevent madness like loading a 100MB file into Ruby's memory just to decide whether it is binary or text. See merge request !2663
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobsJacob Vosmaer2016-02-0221-32/+414
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'allow-@' into 'master' Douwe Maan2016-02-022-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow "@" in file names and path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4111 See merge request !2665
| * | | | | | | | | | | | | | | | Allow "@" in file names and pathallow-@Jacob Vosmaer2016-02-012-4/+12
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'generate-valid-message-id-for-email-rejections' into 'master' Douwe Maan2016-02-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate valid (RFC 2111) Message-ID in email rejection mailer Use a Message-ID that is RFC 2111 compliant. This fix is consistent with how the Message-ID is generated in the 'notify' mailer. See merge request !2656
| * | | | | | | | | | | | | | | | Generate valid Message-ID in email rejection mailerWarren Guy2016-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a Message-ID that is RFC 2111 compliant. This fix is consistent with how the Message-ID is generated in the 'notify' mailer.
* | | | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-02-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo indentation in CI projects' API See merge request !2561
| * | | | | | | | | | | | | | | | | Fix typo indentation in CI projects' APILouis Roché2016-01-221-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rs-regression-issue-guidelines' into 'master' Dmitriy Zaporozhets2016-02-021-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notes about the regression issues to CONTRIBUTING.md [ci skip] See merge request !2661
| * | | | | | | | | | | | | | | | | Add notes about the regression issues to CONTRIBUTING.mdrs-regression-issue-guidelinesRobert Speicher2016-01-311-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | Merge branch 'expand-git-instrumentation' into 'master' Yorick Peterse2016-02-021-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand Git instrumentation This instruments some extra `Gitlab::Git` code as well as a collection of `Rugged` constants. See merge request !2664
| * | | | | | | | | | | | | | | | | Instrument various Rugged constantsexpand-git-instrumentationYorick Peterse2016-02-011-0/+10
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Instrument all Gitlab::Git instance methodsYorick Peterse2016-02-011-2/+4
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'rs-relax-autosize' into 'master' Robert Speicher2016-02-015-3/+278
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow manual resize of js-autosize textareas First, the autosize library was being too controlling and removed the `resize` property from any elements to which it was attached, removing the drag handle. We've disabled this behavior in the vendored library and added a spec to prevent a regression during an upgrade. Second, we detect (as best we can) when the user manually resizes an autosize textarea, and then remove the autosize behavior from it and increase its max-height. This should allow for the best of both worlds. Closes #12832 See merge request !2653
| * | | | | | | | | | | | | | | | | | Allow manual resize of js-autosize textareasrs-relax-autosizeRobert Speicher2016-02-015-3/+278
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, the autosize library was being too controlling and removed the `resize` property from any elements to which it was attached, removing the drag handle. Second, we detect when the user manually resizes an autosize textarea, and then remove the autosize behavior from it and increase its max-height. This should allow for the best of both worlds. Closes #12832
* | | | | | | | | | | | | | | | | | Update CHANGELOGRobert Speicher2016-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | Merge branch 'merge-request-closes-issues-performance' into 'master'Robert Speicher2016-02-013-19/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize fetching issues closed by a merge request Related issue: #12419 See merge request !2625
| * | | | | | | | | | | | | | | | | | Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performanceYorick Peterse2016-02-013-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of running ClosingIssueExtractor for every commit in a merge request we can gather all the commit messages (and the merge request description), concatenate all this together and then run ClosingIssueExtractor only once. The result of this is that MergeRequest#closes_issues is now between 3.5x and 4x faster than the old setup. Using a merge request with 10 commits (each referencing a number of issues to close) this reduced the call duration from around 200 milliseconds to around 50 milliseconds. As a result of these changes the Jira related tests for MergeRequest#closes_issues have been removed. These tests stubbed Commit#closes_issues meaning that the only code that was really tested was the call to Array#uniq to filter out duplicate issues. As this code is no longer used (nor present) the corresponding tests were removed. Related: gitlab-org/gitlab-ce#12419
* | | | | | | | | | | | | | | | | | | Merge branch 'stanhu/gitlab-ce-add-svg-support' into 'master' Dmitriy Zaporozhets2016-02-018-1/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render sanitized SVG images Originally opened at !637 by @stanhu. Closes https://github.com/gitlabhq/gitlabhq/issues/9265 ![Screen_Shot_2016-02-01_at_17.04.01](/uploads/8e5de906698493e127dcdc475da9aaef/Screen_Shot_2016-02-01_at_17.04.01.png) See merge request !2667
| * | | | | | | | | | | | | | | | | | Render sanitized SVG imagesStan Hu2016-02-018-1/+75
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9265
| | | | | | * | | | | | | | | | | | Use gitlab_git 8.0.0Jacob Vosmaer2016-02-022-14/+8
| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Use begin/end instead of defined?Jacob Vosmaer2016-02-021-5/+5
| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Move load command into _text partialJacob Vosmaer2016-02-022-1/+1
| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Update development version of gitlab_gitJacob Vosmaer2016-02-011-1/+1
| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Update gitlab_git@lazy-blob againJacob Vosmaer2016-02-011-1/+1
| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Update gitlab_git (lazy-blob branch)Jacob Vosmaer2016-02-011-2/+2
| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Develop with a custom gitlab_git branchJacob Vosmaer2016-02-012-7/+13
| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobsJacob Vosmaer2016-02-01430-2611/+16092
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'take-guidelines-into-account-for-mrs' into 'master' Dmitriy Zaporozhets2016-02-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to Thoughtbot review guidelines. See merge request !2658
| * | | | | | | | | | | | | | | | | Link to Thoughtbot review guidelines.take-guidelines-into-account-for-mrsSytse Sijbrandij2016-01-301-0/+2
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rs-two-factor-casing' into 'master' Robert Speicher2016-02-014-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make "Two-factor" casing consistent throughout the application See merge request !2662
| * | | | | | | | | | | | | | | | | Make "Two-factor" casing consistent throughout the applicationrs-two-factor-casingRobert Speicher2016-01-314-6/+6
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Update CHANGELOGRobert Speicher2016-01-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | Merge branch 'improve-gitlab-flow-doc' into 'master' Achilleas Pipinellis2016-01-311-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitLab flow documentation regarding the WIP merge requests See merge request !2647
| * | | | | | | | | | | | | | | | Improve GitLab flow documentation regarding the WIP merge requestsimprove-gitlab-flow-docRémy Coutable2016-01-291-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | Merge branch 'rename-inline-diff' into 'master' Robert Speicher2016-01-3113-78/+206
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark inline difference between old and new paths when a file is renamed See merge request !2652
| * | | | | | | | | | | | | | | | Fewer html_safesrename-inline-diffDouwe Maan2016-01-301-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix specs and add a new oneDouwe Maan2016-01-302-28/+37
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-2912-75/+194
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rs-issue-12706' into 'master' Douwe Maan2016-01-306-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the minimum length for commit SHA matching to 7 This is the git default and will help to prevent false positive matches. Closes #12706 See merge request !2655