summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update redcarpet gem. Fixes gem memory leakupdate-redcarpetDmitriy Zaporozhets2015-10-152-3/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-markdown-typography' into 'master' Dmitriy Zaporozhets2015-10-156-36/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | Markdown typography CSS fixes The `!important` flags recently added to the `md-typography` mixin's `pre` elements were overriding the background and foreground colors for syntax highlighting. | Before | After | |:------:|:-----:| | ![Screen_Shot_2015-09-25_at_3.32.32_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/802163bd9f46864ac89e7be165951f07/Screen_Shot_2015-09-25_at_3.32.32_PM.png) | ![Screen_Shot_2015-09-25_at_3.33.30_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6be72036653378405320085324dff5ad/Screen_Shot_2015-09-25_at_3.33.30_PM.png) | See merge request !1442
| * Update highlight themes so they always have the correct colorsrs-markdown-typographyRobert Speicher2015-10-145-34/+26
| |
| * Allow highlight themes to override `pre` colorsRobert Speicher2015-10-141-2/+2
| |
* | Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications'Dmitriy Zaporozhets2015-10-153-2/+16
|\ \
| * | Fix bug where merge request comments created by API would not trigger ↵Stan Hu2015-10-103-2/+16
| | | | | | | | | | | | | | | | | | notifications Closes https://github.com/gitlabhq/gitlabhq/issues/9715
* | | Fix builds view count indicatorKamil Trzcinski2015-10-152-5/+5
| | |
* | | Merge branch 'fix/improve_reset_service_password_v2' into 'master' Valery Sizov2015-10-158-53/+259
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve invalidation of stored service password if the endpoint URL is changed (V2) New version of !1583, using the same failproof logic but this time mirroring the name and behaviour of the change-tracking methods of ActiveModel::Dirty in order to make it clearer and more natural. Added more tests to clarify the expected behaviour. This is an alternative to !1594 /cc @vsizov @rspeicher See merge request !1600
| * | | Improve invalidation of stored service password if the endpoint URL is changedimprove_reset_service_password_v2Alex Lossent2015-10-158-53/+259
| | | | | | | | | | | | | | | | | | | | Password can now be specified at the same time as the new URL, and the service template admin pages now work.
* | | | Merge branch 'user-by-login-performance' into 'master' Yorick Peterse2015-10-155-3/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve User.by_login performance This greatly speeds up the performance of `User.by_login`. I adopted some changes from @haynes in this patch, the credits go to him for coming up with those originally. Fixes #2341 See merge request !1545
| * | | | Improve performance of User.by_loginuser-by-login-performanceYorick Peterse2015-10-155-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance is improved in two steps: 1. On PostgreSQL an expression index is used for checking lower(email) and lower(username). 2. The check to determine if we're searching for a username or Email is moved to Ruby. Thanks to @haynes for suggesting and writing the initial implementation of this. Moving the check to Ruby makes this method an additional 1.5 times faster compared to doing the check in the SQL query. With performance being improved I've now also tweaked the amount of iterations required by the User.by_login benchmark. This method now runs between 900 and 1000 iterations per second.
* | | | | Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-1537-36/+226
|\ \ \ \ \
| * | | | | Added documentation on the various profiling toolsview-issue-performanceYorick Peterse2015-10-151-0/+56
| | | | | |
| * | | | | Fixed Rubocop styling issuesYorick Peterse2015-10-152-5/+5
| | | | | |
| * | | | | Renamed Note.inc_associations to with_associationsYorick Peterse2015-10-152-2/+2
| | | | | |
| * | | | | Changelog entry for issue page speedupsYorick Peterse2015-10-151-0/+1
| | | | | |
| * | | | | Don't use link_to/image_tag where not neededYorick Peterse2015-10-153-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In these particular instances we can just use HAML tags directly. This can shave off some time spent loading issue pages, though this depends on the amount of comments being displayed. When viewing https://gitlab.com/gitlab-org/gitlab-ce/issues/2164 locally these changes reduce loading time by about 400 ms in total.
| * | | | | Improve ProjectTeam#max_member_access performanceYorick Peterse2015-10-152-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By comparing objects in Ruby we can greatly improve the performance of this method. In the worst case (should no data be eager loaded) this will run the same amount of queries as before, in the best case (when data _is_ eager loadeD) it requires no queries at all. The added benchmark used to produce around 273 iterations per second. With this commit this has been increased to almost 40 000 iterations per second: a speedup of roughly 145 times. Combined with eager loading Note associations this results in about 30 queries less when viewing a single issue, this in turn cuts down the loading time by 30-40%.
| * | | | | Eager load project associations for notesYorick Peterse2015-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that when viewing an issue each note already has the associated project, project members, group and group members available. Since this information is requres for every note this results in quite the reduction of SQL queries being executed.
| * | | | | Eager load note projects when viewing issuesYorick Peterse2015-10-151-1/+4
| | | | | |
| * | | | | Added rack-lineprof for developmentYorick Peterse2015-10-154-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to measure the time (roughly) spent on a per line basis. This can also be used to measure timings for views, for example by adding the following to a URL: ?lineprof=app/views/projects/notes/_note rack-lineprof is only enabled when: 1. The application runs in development mode 2. The used Ruby is MRI 3. The environment variable ENABLE_LINEPROF is set to a non-empty value
| * | | | | Added active_record_query_traceYorick Peterse2015-10-153-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to track down where queries originate from, regardless of whether they're caused by N+1 problems or not. This can be enabled by setting the environment variable ENABLE_QUERY_TRACE to a non-empty value (e.g. "true").
| * | | | | Added Bullet to the GemfileYorick Peterse2015-10-153-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to resolve N+1 query problems. Bullet is disabled by default and can be enabled by starting Rails with the environment variable ENABLE_BULLET set to a non empty value (e.g. "true").
| * | | | | Use note.author for issue comment avatarsYorick Peterse2015-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for running a query to find the User object again based on the supplied Email address.
| * | | | | Eager load various issue/note associationsYorick Peterse2015-10-154-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures we don't end up running N+1 queries for the objects in the affected collections.
| * | | | | Re-use User for avatars in link_to_memberYorick Peterse2015-10-152-1/+15
| | | | | |
| * | | | | Re-use User objects for avatar_icon where possibleYorick Peterse2015-10-1516-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | This removes the need for running an extra SQL query in these cases.
| * | | | | Allow avatar_icon to operate on a UserYorick Peterse2015-10-152-3/+16
| |/ / / / | | | | | | | | | | | | | | | | | | | | If the User object is already known before calling this method being able to re-use said object can save us an extra SQL query.
* | | | | Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-1513-253/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let gitlab-git-http-server handle archive downloads This change relies on changes in gitlab_git and gitlab-git-http-server. fixes #2429 See merge request !1548
| * \ \ \ \ Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-15320-2482/+4551
| |\ \ \ \ \
| * | | | | | Update gitlab_git to 7.2.19Jacob Vosmaer2015-10-152-3/+3
| | | | | | |
| * | | | | | Always return HTML in git_not_foundJacob Vosmaer2015-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to give a nice 404 for e.g. archive.zip.
| * | | | | | Remove archive file sending specJacob Vosmaer2015-10-141-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by gitlab-git-http-server now.
| * | | | | | Remove RepositoryArchiveWorker specsJacob Vosmaer2015-10-142-145/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These tasks have shifted to gitlab_git and gitlab-git-http-server.
| * | | | | | Fix API archive specsJacob Vosmaer2015-10-141-6/+3
| | | | | | |
| * | | | | | Fix NGINX API download regexJacob Vosmaer2015-10-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Users are allowed to supply namespace%2Fproject instead of a numeric ID
| * | | | | | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-086-70/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change relies on changes in gitlab_git and gitlab-git-http-server.
* | | | | | | Merge branch 'builds-view' into 'master' Kamil Trzciński2015-10-1522-28/+245
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added builds view ![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png) /cc @dzaporozhets @vsizov See merge request !1593
| * | | | | | | Remove unneeded changebuilds-viewKamil Trzcinski2015-10-152-3/+3
| | | | | | | |
| * | | | | | | Fix testsKamil Trzcinski2015-10-141-2/+1
| | | | | | | |
| * | | | | | | Fix cancel_all specsKamil Trzcinski2015-10-143-4/+4
| | | | | | | |
| * | | | | | | Fix specsKamil Trzcinski2015-10-145-23/+23
| | | | | | | |
| * | | | | | | Refactor builds viewKamil Trzcinski2015-10-145-31/+32
| | | | | | | |
| * | | | | | | Remove ordering from :ci_commits relationKamil Trzcinski2015-10-145-20/+22
| | | | | | | |
| * | | | | | | Added builds viewKamil Trzcinski2015-10-1415-7/+222
| | | | | | | |
* | | | | | | | Merge branch 'fix-path-with-leading-dot-error' into 'master' Dmitriy Zaporozhets2015-10-156-2/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error preventing displaying of commit data for a directory with a leading dot Directories with leading dots erroneously get rejected by the route controller if git ref regex is used in constraints. This prevents commit data from being loaded. The regex verification is now done in controller. Closes https://github.com/gitlabhq/gitlabhq/issues/8763 See merge request !1574
| * | | | | | | | Fix error preventing displaying of commit data for a directory with a ↵Stan Hu2015-10-126-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leading dot Closes https://github.com/gitlabhq/gitlabhq/issues/8763
* | | | | | | | | Merge branch 'rs-remove-guard' into 'master' Dmitriy Zaporozhets2015-10-152-39/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove guard-rspec and its supporting gems See merge request !1551
| * | | | | | | | Remove guard-rspec and its supporting gemsrs-remove-guardRobert Speicher2015-10-082-39/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'rs-update-uglifier' into 'master' Dmitriy Zaporozhets2015-10-152-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update uglifier to ~> 2.7.2 Fixes a security vulnerability: - https://github.com/lautis/uglifier/pull/86 - https://github.com/mishoo/UglifyJS2/issues/751 - https://zyan.scripts.mit.edu/blog/backdooring-js/ See merge request !1590