summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* edit_blob_link can receive the blob to avoid access to the repository20454-edit-button-mrPaco Guzman2016-08-181-6/+3
|
* Merge branch '18141-pipeline-graph' into 'master' Jacob Schatz2016-08-171-9/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pipeline graph ## What does this MR do? Adds pipeline visualization ## What are the relevant issue numbers? Closes #18141 Part of #19982 ## Screenshots (if relevant) ![Screen_Shot_2016-08-16_at_7.59.52_PM](/uploads/c9dd695d2ddbd2a85e98a5b4e500d52c/Screen_Shot_2016-08-16_at_7.59.52_PM.png) ![Screen_Shot_2016-08-16_at_7.55.49_PM](/uploads/5ab548cc5fc8a42371d3b54108798c02/Screen_Shot_2016-08-16_at_7.55.49_PM.png) See merge request !5742
| * Merge master into branchAnnabel Dunstone2016-08-172-21/+25
| |\
| * | Update CSS selector and play iconAnnabel Dunstone2016-08-171-2/+2
| | |
| * | Add deploy btn in graph; fix JS to toggle one graph at a time if multiple ↵Annabel Dunstone2016-08-171-2/+2
| | | | | | | | | | | | pipelines
| * | Add support for Play and Created jobsKamil Trzcinski2016-08-171-9/+17
| | |
* | | Merge branch 'issue-boards' into 'master' Douwe Maan2016-08-171-0/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue boards ## What are the relevant issue numbers? - Issue: #17907 - Issue backend: #20335 - Backend MR: !5548 - Frontend MR: !5554 - Documentation !5713 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [X] ~~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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5548
| * | Reverted milestone upcoming default filterPhil Hughes2016-08-171-6/+2
| | |
| * | Defaults milestone filter to upcomingPhil Hughes2016-08-171-2/+6
| | |
| * | Initial issue boards UIPhil Hughes2016-08-171-0/+4
| |/
* | Merge branch 'mc-ui'Douwe Maan2016-08-171-0/+1
|\ \ | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb
| * \ Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-171-8/+33
| |\ \ | | |/
| * | Merge branch 'master' into mc-uiDouwe Maan2016-08-152-3/+9
| |\ \
| * | | Added routes for conflicts in merge requests page.Fatih Acet2016-08-121-0/+1
| | | |
* | | | Eliminate unneeded calls to Repository#blob_at when listing commits with no pathfix/eliminate-unneeded-calls-to-repository-blob-atAhmad Sherif2016-08-171-21/+24
| |_|/ |/| |
* | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-161-8/+33
| |/ |/|
* | Restore `Largest repository` sort option on admin projects page20317-admin-cant-order-by-sizeAlfredo Sumaran2016-08-151-1/+7
| |
* | Merge branch '20842-todos-queries-cache' into 'master' Yorick Peterse2016-08-151-2/+2
|\ \ | |/ |/| | | | | Try to get back todo's cache or at least avoid hitting the database See merge request !5789
| * Recover usage of Todos counter cache20842-todos-queries-cachePaco Guzman2016-08-121-2/+2
| | | | | | | | | | | | | | We’re being kept up to date the counter data but we’re not using it. The only thing which is not real if is the number of projects that the user read changes the number of todos can be stale for some time. The counters will be sync just after the user receives a new todo or mark any as done
* | Merge branch '20059-environment-list' into 'master' Jacob Schatz2016-08-121-2/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Format branch, tag, and commit in environment list" ## What does this MR do? Updates Environments page rows to match the new pipeline updates ## Are there points in the code the reviewer needs to double check? I removed `private` from `avatars_helper.rb` so I could use `user_avatar`. ## What are the relevant issue numbers? Closes #20059 ## Screenshots (if relevant) ![Screen_Shot_2016-08-08_at_11.44.36_AM](/uploads/62fbb475a7d9cc613fe5ba1715229553/Screen_Shot_2016-08-08_at_11.44.36_AM.png) ![Screen_Shot_2016-08-08_at_11.44.41_AM](/uploads/ce1bd3ab62c0bc8091e9b6f85012ed36/Screen_Shot_2016-08-08_at_11.44.41_AM.png) See merge request !5687
| * Add avatar to commit message; environment style updates to match pipelines pageAnnabel Dunstone2016-08-081-2/+0
| |
* | Show member roles to all users on members page20614-show-member-roles-to-all-usersDouwe Maan2016-08-111-6/+0
| |
* | Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-111-0/+67
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove Grack::Auth: part 2 (LFS) Deprecate Grack::Auth and handle LFS in Rails controllers under the Project namespace. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14501 See merge request !5369
| * | Rename lfs_enabled helper methodJacob Vosmaer2016-08-101-1/+1
| | |
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-08-0913-87/+83
| |\ \ | | | | | | | | | | | | remove-grack-lfs
| * | | RubocopJacob Vosmaer2016-07-221-1/+2
| | | |
| * | | Add LFS controllersJacob Vosmaer2016-07-221-0/+66
| | | |
* | | | Avoid commit lookup on diff_helperexplicit-arguments-on-diff_file_html_dataPaco Guzman2016-08-101-3/+2
| | | |
* | | | Update tree view to sort folders with submodulesAdam Buckland2016-08-091-15/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently trees are sorted in the fashion: - folders - files - submodules with each section sorted alphabetically This changes to this system: - folders and submodules (sorted together) - files
* | | Merge branch 'rubocop/EmptyLinesAroundModuleBody' into 'master' Douwe Maan2016-08-081-2/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/EmptyLinesAround Module/Class Body cop ## What does this MR do? Enable a new rubocop cops as discussed here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1877/diffs#note_13021078 ## Are there points in the code the reviewer needs to double check? May be a good idea to send a message to people to prevent `master` red because of the new cop. ## Why was this MR needed? We want to improve code style and not waste endbosses time checking style manually ## 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 - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5692
| * | | Enable Style/EmptyLinesAroundModuleBody copGabriel Mazetto2016-08-061-2/+0
| | |/ | |/|
* | | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-062-2/+2
|/ /
* | Merge branch '19752-pipelines-finished-at' into 'master' Jacob Schatz2016-08-051-2/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update timeago to shorter representation ## What does this MR do? Shortens representation of `Finished at` block in pipelines & builds ## What are the relevant issue numbers? Closes #19752 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-14_at_8.54.44_AM](/uploads/85000549c49165d4481422eac5eb0ca9/Screen_Shot_2016-07-14_at_8.54.44_AM.png) See merge request !5225
| * | Update timeago to shorter representation19752-pipelines-finished-atAnnabel Dunstone2016-08-041-2/+6
| | |
* | | Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-041-14/+25
|/ /
* | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-4/+1
| | | | | | | | So we have raw_diffs too
* | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-1/+1
| | | | | | Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
* | Cache highlighted diff lines for merge requestsPaco Guzman2016-08-032-8/+7
| | | | | | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
* | Merge branch 'rs-external-issue-tracker-redirect' into 'master' Douwe Maan2016-08-021-32/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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! :tada: See merge request !5608
| * | Remove `url_for_new_issue` helperrs-external-issue-tracker-redirectRobert Speicher2016-08-011-16/+0
| | | | | | | | | | | | | | | Now we link to the standard `IssuesController#new` action, and let it redirect if we're using an external tracker.
| * | Redirect to external issue tracker from `/issues`Robert Speicher2016-08-011-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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! :tada:
* | | Merge branch '14202-speed-up-diff-note-active' into 'master' Yorick Peterse2016-08-021-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Speedup DiffNote#active? on discussions See merge request !5597
| * | | Speedup DiffNote#active? on discussions, preloading noteables and avoid ↵Paco Guzman2016-08-021-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touching git repository to return diff_refs when possible - Preloading noteable we share the same noteable instance when more than one discussion refers to the same noteable. - Any other call to that object that is cached in that object will be for any discussion. - In those cases where merge_request_diff has all the sha stored to build a diff_refs get that diff_refs using directly those sha instead accessing to the git repository to first get the commits and later the sha.
* | | Merge branch '20101-ci-configuration' into 'master' Fatih Acet2016-08-021-0/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""CI configuration" button when `.gitlab-ci.yml` is present" ## What does this MR do? Adds `CI configuration` button to project overview page ## What are the relevant issue numbers? Closes #20101 ## Screenshots (if relevant) ![Screen_Shot_2016-07-28_at_11.51.32_AM](/uploads/499d942d203d287ae98b7589ef12673c/Screen_Shot_2016-07-28_at_11.51.32_AM.png) See merge request !5558
| * | Link configuration button to .gitlab-ci.yml20101-ci-configurationAnnabel Dunstone2016-07-281-0/+4
| | |
* | | Merge branch '15064_issuable_default_sort_order' into 'master' Rémy Coutable2016-08-012-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sensible state specific default sort order for issues and merge requests ## What does this MR do? It provides more sensible default sort order for issues and merge requests based on the following table: | type | state | default sort order | |----------------|--------|--------------------| | issues | open | last created | | issues | closed | last updated | | issues | all | last created | | merge requests | open | last created | | merge requests | merged | last updated | | merge requests | closed | last updated | | merge requests | all | last created | ## Are there points in the code the reviewer needs to double check? All the bits where `id_desc` was changed to `created_desc`. I hope it's okay, It makes more sense in my opinion. ## Why was this MR needed? Prior to this MR the issues and merge request were sorted based on `id_desc` by default. This MR aims to make the interface more user-friendly by providing state specific sorting defaults most users would expect. ## What are the relevant issue numbers? See #15064 See merge request !5453
| * | | State specific default sort order for issuableszs2016-08-012-3/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide more sensible default sort order for issues and merge requests based on the following table: | type | state | default sort order | |----------------|--------|--------------------| | issues | open | last created | | issues | closed | last updated | | issues | all | last created | | merge requests | open | last created | | merge requests | merged | last updated | | merge requests | closed | last updated | | merge requests | all | last created |
* | | Improve diff performance by eliminating redundant checks for text blobsremove-redundant-blob-text-callsStan Hu2016-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | On a merge request with over 1000 changed files, there were redundant calls to blob_text_viewable?, which incurred about 7% of the time. Improves #14775
* | | Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-291-2/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Rubocop cops that check access modifiers ## What does this MR do? This MR enables Rubocop cops that detect methods that should be restricted but are the part of public API because of access modifiers used improperly. This also fixes existing offenses. ## Why was this MR needed? Some method in our codebase are public instead of being private because it is sometimes difficult to get it right without static analysis. ## What are the relevant issue numbers? See #17478 Closes #17372 See merge request !5014
| * | Fix some useless access modifiers in the codeGrzegorz Bizon2016-07-191-2/+0
| | |