- 12 Aug, 2016 3 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
- 10 Aug, 2016 2 commits
-
-
Connor Shea authored
-
Connor Shea authored
-
- 09 Aug, 2016 2 commits
-
-
Connor Shea authored
-
Connor Shea authored
-
- 05 Aug, 2016 1 commit
-
-
Douwe Maan authored
-
- 04 Aug, 2016 4 commits
-
-
Douwe Maan authored
-
Phil Hughes authored
-
Phil Hughes authored
Ordered the jump to discussion by order in the DOM
-
Phil Hughes authored
Fixed some bugs when removing notes
-
- 03 Aug, 2016 22 commits
-
-
Douwe Maan authored
# Conflicts: # app/models/discussion.rb # db/schema.rb
-
Douwe Maan authored
change the API on the merge_request_diff model from diffs -> raw_diffs ## What does this MR do? Unify diffs API ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - ~~[ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - ~~[ ] Added for this feature/bug~~ - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5650
-
Paco Guzman authored
-
Douwe Maan authored
Speed up methods that depend on diff stats only ## What does this MR do? Speeds up and reduces memory usage of `Commit#repo_changes`loop, `Repository#expire_avatar_cache` and `IrkerWorker`. It's a WIP because it need a new version of `gitlab_git` released with [these changes](https://gitlab.com/gitlab-org/gitlab_git/merge_requests/109). ## Are there points in the code the reviewer needs to double check? N/A ## Why was this MR needed? For large files committed, this method ends up loading them in memory which can consume lots of memory. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19441#note_13425892 ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - ~~Tests~~ - [ ] ~~Added for this feature/bug~~ - [ ] ~~All builds are passing~~ - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5568
-
Robert Speicher authored
Update the gitlab-shell version in the tmp/tests directory to the right version Previously the gitlab-shell version would never be updated if the directory existed via the `gitlab:shell:install` Rake task. This could lead to incompatibility issues or random errors. See merge request !5646
-
Stan Hu authored
Previously the gitlab-shell version would never be updated if the directory existed via the `gitlab:shell:install` Rake task. This could lead to incompatibility issues or random errors.
-
Ahmad Sherif authored
-
Stan Hu authored
-
Ahmad Sherif authored
-
Douwe Maan authored
Cache diff syntax highlighted output ## What does this MR do? Cache highlighted diffs for merge requests when they are requested for existing merge requests but after each change on the merge request diff recalculate again the cache. I've introduced the concept of SafeDiffs which are the diffs that we're going to show on the UI and will be highlighted so maybe we can extend cache capabilities to more diffs. The more problematic part is what and how we cache the highlighted lines, for the moment what I did was store in Redis as Gitlab::Diff::Line serialized as an array of json objects, similar of what we do for commits and diffs on merge request diffs. The next step can be add a new field in the merge_request_diff object if we find it worth it. But let's first confirm this is the way to go ## What are the relevant issue numbers? Closes #20034 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5401
-
Douwe Maan authored
-
Achilleas Pipinellis authored
Add advanced troubleshooting for debugging issues with the Docker registry See merge request !5615
-
Achilleas Pipinellis authored
[ci skip]
-
Fatih Acet authored
Fix filter input alignment ## What does this MR do? If you carefully observe the filter inputs on the [issues page](https://gitlab.com/gitlab-org/gitlab-ce/issues) and the [projects dashboard page](https://gitlab.com/dashboard/projects), you will notice that those input fields are actually a few pixels lower than the UI elements beside them (More so for the projects dashboard page than the issues page). This MR fixes that alignment issue so that they are aligned to the buttons on their right. ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improves the existing UI ## What are the relevant issue numbers? Closes #20559 ## Screenshots (if relevant) Before ![Screen_Shot_2016-08-02_at_5.42.28_PM](/uploads/8530fc6c9ce20f28ae74b950bc1bd6be/Screen_Shot_2016-08-02_at_5.42.28_PM.png) After ![Screen_Shot_2016-08-02_at_5.49.28_PM](/uploads/ec20e68045c2190aec52e5f059d1a3bc/Screen_Shot_2016-08-02_at_5.49.28_PM.png) After (with color markings) ![Screen_Shot_2016-08-02_at_5.49.25_PM](/uploads/6e032b1ffb438018f6fadf294c3cebd3/Screen_Shot_2016-08-02_at_5.49.25_PM.png) Before ![Screen_Shot_2016-08-02_at_5.41.19_PM](/uploads/11a3c30d0290328bb3298bc392facf9f/Screen_Shot_2016-08-02_at_5.41.19_PM.png) After ![Screen_Shot_2016-08-02_at_5.49.47_PM](/uploads/f8e20346a19dc67cc3e54788dc0e72fb/Screen_Shot_2016-08-02_at_5.49.47_PM.png) After (with color markings) ![Screen_Shot_2016-08-02_at_5.49.58_PM](/uploads/1839d5681ab2f3518609004511af86a6/Screen_Shot_2016-08-02_at_5.49.58_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5633
-
Achilleas Pipinellis authored
Move markdown doc to the right location See merge request !5635
-
Achilleas Pipinellis authored
[ci skip]
-
Paco Guzman authored
So we have raw_diffs too
-
Paco Guzman authored
This object will manage Gitlab::Git::Compare instances
-
Paco Guzman authored
Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
-
Paco Guzman authored
Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
-
Jacob Schatz authored
Remove delay when hitting Reply... button on page with a lot of comments Every time the "Reply..." button was hit, a new `GLForm` was instantiated (which is fine), which would then call `GitLab.GfmAutoComplete.setup()` without specifying which textarea we needed autocompletion on, which resulted in `GitLab.GfmAutoComplete.setup` iterating through every single textarea on the page. On a page with a lot of comments, where each comment would have its own textarea that will be used to edit the comment, this would take a long time and cause the whole page to hang for 2 seconds when a "Reply..." button was clicked. See merge request !5602
-
Jacob Schatz authored
Convert image diff background image to CSS ## What does this MR do? Replaces the `trans_bg.gif` image used for image diff background image with a CSS implementation of the same background image ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Uses CSS to replace the use of an image so that webpage rendering is slightly improved ## What are the relevant issue numbers? Closes #20500 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-01_at_12.29.10_PM](/uploads/8269877c561c29e6b0ca988079ff3fc6/Screen_Shot_2016-08-01_at_12.29.10_PM.png) After: ![Screen_Shot_2016-08-01_at_12.29.16_PM](/uploads/cc88848b9c0e044445d19b889fd79271/Screen_Shot_2016-08-01_at_12.29.16_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5598
-
- 02 Aug, 2016 6 commits
-
-
Douwe Maan authored
Add simple identifier to public SSH keys ## What does this MR do? Adds a simple identifier of user_name + hostname to public SSH keys ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To help people identify keys when they export them ## What are the relevant issue numbers? #18866 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ -] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ -] API support added - Tests - [ x] Added for this feature/bug - [ x] All builds are passing - [ x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #18866 See merge request !5614
-
Douwe Maan authored
Redirect to external issue tracker from `/issues` Prior, in order to display the correct link to "Issues" in the project navigation, we were performing a check against the project to see if it used an external issue tracker, and if so, we used that URL. This was inefficient. Now, we simply _always_ link to `namespace_project_issues_path`, and then in the controller we redirect to the external tracker if it's present. This also removes the need for the `url_for_issue` helper. Bonus!
🎉 See merge request !5608 -
Clement Ho authored
-
Stan Hu authored
[ci skip]
-
Stan Hu authored
[ci skip]
-
Dmitriy Zaporozhets authored
Convert switch icon into icon font ## What does this MR do? Converts the switch icon into the exchange icon from font awesome ## Are there points in the code the reviewer needs to double check? Shouldn't be any ## Why was this MR needed? * Decreases an external resource for the repository compare page * Icon font provides a sharper image for displays with higher pixel resolutions ## What are the relevant issue numbers? Closes #20508 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-01_at_3.06.06_PM](/uploads/6ad46cc6dff98ec534e1f5a0fe556fa7/Screen_Shot_2016-08-01_at_3.06.06_PM.png) After: ![Screen_Shot_2016-08-01_at_3.06.10_PM](/uploads/3cb11c40cbba398f9986a4cc6b3a7e4c/Screen_Shot_2016-08-01_at_3.06.10_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5603
-