summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use right margin for componened other than button for top navrefactor-nav-controlsDmitriy Zaporozhets2016-02-031-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Tried to align form input vertically with other elements for top navDmitriy Zaporozhets2016-02-032-6/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make nav-controls responsive and hide on extra small screensDmitriy Zaporozhets2016-02-032-16/+42
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor nav controls section (search and new project/group btn)Dmitriy Zaporozhets2016-02-037-140/+107
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add number_with_delimiter and remove unnecessary dara placement for groups pageimprove-groups-listDmitriy Zaporozhets2016-02-032-4/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve UI consistency between projects and groups listsDmitriy Zaporozhets2016-02-025-20/+49
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update CHANGELOGRobert Speicher2016-02-021-0/+3
| | | | [ci skip]
* Merge branch 'patch-1' into 'master' Robert Speicher2016-02-021-1/+1
|\ | | | | | | | | | | | | Consistent rails_socket use. [ci skip] See merge request !2596
| * Consistent rails_socket use.fbretel2016-01-251-1/+1
| |
* | Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-029-25/+37
|\ \ | | | | | | | | | | | | | | | | | | Send raw Git blobs via gitlab-workhorse See merge request !2451
| * | Use gitlab-workhorse 0.6.3 in installation guidegit-raw-workhorseJacob Vosmaer2016-02-021-1/+1
| | |
| * | Use gitlab-workhorse 0.6.3Jacob Vosmaer2016-02-021-1/+1
| | |
| * | Merge remote-tracking branch 'origin/master' into git-raw-workhorseJacob Vosmaer2016-02-0221-32/+414
| |\ \
| * | | Use @repositoryJacob Vosmaer2016-02-021-3/+2
| | | |
| * | | Gotta have newlinesJacob Vosmaer2016-02-011-1/+1
| | | |
| * | | Avoid trailing 'charset=' garbageJacob Vosmaer2016-02-012-2/+4
| | | |
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-01506-2815/+16995
| |\ \ \ | | | | | | | | | | | | | | | git-raw-workhorse
| * | | | Use only one header to send git blobsJacob Vosmaer2016-02-014-8/+25
| | | | |
| * | | | Cannot see a raw blob without workhorseJacob Vosmaer2016-01-281-1/+1
| | | | |
| * | | | No need for base64 anymoreJacob Vosmaer2016-01-281-2/+0
| | | | |
| * | | | Send more raw blob data with workhorseJacob Vosmaer2016-01-283-10/+11
| | | | |
| * | | | Use less memory while counting linesJacob Vosmaer2016-01-281-1/+1
| | | | |
| * | | | Use a /raw/ request to show an imageJacob Vosmaer2016-01-201-1/+1
| | | | |
| * | | | Prototype of Git blobs via workhorseJacob Vosmaer2016-01-151-11/+6
| | | | |
* | | | | 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]