summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Exclude projects pending delete from notificationspending-delete-project-notificationsSean McGivern2016-07-071-1/+8
| | | | | | | If the Sidekiq job fails for some reason, a project can be 'stuck' pending deletion. The project can't be viewed, so it shouldn't be available through the notification settings association as this will throw an exception when we try to show the link.
* Fix invite user feature test and improve request member UI rowDmitriy Zaporozhets2016-07-071-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve UI for member row on project/group members pagesDmitriy Zaporozhets2016-07-072-45/+53
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add data when member joined a teamValery Sizov2016-07-071-0/+4
|
* Merge branch 'services_refactoring1' into 'master' Dmitriy Zaporozhets2016-07-0718-43/+37
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Services: code style fixes, minor refactoring ## What does this MR do? It contains code style fixes, minor refactoring and also it removes some unnecessary comments. Every comment require a support just like a regular code line and this is why we should avoid using comments everywhere unless it's really helpful. Martin Fowler said "Find comment and refactor the code around it" :) our code is not that bad so let's not spoil it with comments. ## Why was this MR needed? Because GitLab is a live example of awesome code. Let's keep up a good job :) See merge request !5112
| * Services: code style fixes, minor refactoringservices_refactoring1Valery Sizov2016-07-0618-43/+37
| |
* | Merge branch 'show_push_widget_in_upstream' into 'master' Rémy Coutable2016-07-072-2/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show last push widget in upstream after push to fork ## What does this MR do? Show the last push widget in the upstream project when you push to a fork. ## Are there points in the code the reviewer needs to double check? In the view, I'm checking if `@project` in the first part of the conditional. I felt it was necessary in case `@project` wasn't an object in all cases. Will it ever not be there? Is this check necessary? Should there be tests? I don't see existing ones for this. ## Why was this MR needed? I use the fork workflow everywhere and it has annoyed me for some time that the last push widget doesn't show up when viewing the upstream project. I'm almost never viewing the fork in GitLab so I want to be able to easily create a MR in any case. ## Screenshots (if relevant) **Widget in upstream repo:** ![Screen_Shot_2016-06-23_at_10.05.29_AM](/uploads/f823642e40cf059c3793db6cf00bba50/Screen_Shot_2016-06-23_at_10.05.29_AM.png) **Widget in fork**: ![Screen_Shot_2016-06-23_at_10.05.25_AM](/uploads/1a976241186ec42cdc43c80bea0c856b/Screen_Shot_2016-06-23_at_10.05.25_AM.png) **Widget on dashboard**: ![Screen_Shot_2016-06-23_at_10.06.07_AM](/uploads/084ac35f67735aec8042d9bc904255fe/Screen_Shot_2016-06-23_at_10.06.07_AM.png) See merge request !4880
| * | Show last push widget in upstream after push to forkDrew Blessing2016-07-062-2/+8
| | |
* | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-07-071-14/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow everyone to order tags, not only those who has access ## What does this MR do? Allows everyone to view tags by different order (by name, date, etc), not only those who has access ## Are there points in the code the reviewer needs to double check? Just check how it's rendered. ## Why was this MR needed? Because now I can't order other's project tags. ## What are the relevant issue numbers? #15438 ## Screenshots (if relevant) Exist in related issue. Look [one comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/15438#note_12888763) and [just below there is another one](https://gitlab.com/gitlab-org/gitlab-ce/issues/15438#note_12888819). ## Does this MR meet the acceptance criteria? Probably, no need See merge request !5105
| * | | Allow everyone to sort tags, not only those who has accessSerg2016-07-061-14/+14
| |/ /
* | | Merge branch 'build-auto-refresh' into 'master' Jacob Schatz2016-07-062-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with build auto-refresh not working ## What does this MR do? Due to the `.json` at the end of the build URL fetch, the page wont correctly auto-reload the build log. This fixes that. See merge request !5110
| * | | Fixed issue with build auto-refresh not workingbuild-auto-refreshPhil Hughes2016-07-062-5/+5
| | |/ | |/|
* | | Merge branch '18283-pluralize-stage-headings' into 'master' Jacob Schatz2016-07-062-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of pluralize on stage names ## What does this MR do? Removes `pluralize` from stage names ## What are the relevant issue numbers? Closes #18283 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-06_at_11.11.39_AM](/uploads/b1b2dd00dc8aacc6dff40cab1fe1ecdd/Screen_Shot_2016-07-06_at_11.11.39_AM.png) cc @ayufan See merge request !5117
| * | | Get rid of pluralize on stage namesAnnabel Dunstone2016-07-062-2/+2
| | | |
* | | | Merge branch '18858-options-dropdown-on-mobile-should-be-full-width' into ↵Jacob Schatz2016-07-061-0/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Added 100% width to open dropdown menus on mobile ## What does this MR do? Sets dropdown-menus to be 100% width on small screens. ## Are there points in the code the reviewer needs to double check? Do we want this on all dropdown menus or only dropdown menus activated by full-width buttons? /cc @dzaporozhets ## Why was this MR needed? Mobile UX. ## What are the relevant issue numbers? Closes #18858. ## Screenshots (if relevant) ![Screen_Shot_2016-06-22_at_00.14.09](/uploads/bd61721896bfac8af951374c2547acd6/Screen_Shot_2016-06-22_at_00.14.09.png) ## 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 !4844
| * | | Added 100% width to open dropdown menus on mobile18858-options-dropdown-on-mobile-should-be-full-widthLuke "Jared" Bennett2016-06-221-0/+3
| | | |
* | | | Merge branch 'escape-to-cancel-note' into 'master' Jacob Schatz2016-07-061-9/+39
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Cancel creating or editing note by hitting Escape /cc @rspeicher See merge request !5075
| * | | Use switch/when statementescape-to-cancel-noteDouwe Maan2016-07-051-21/+24
| | | |
| * | | Double to single quotesDouwe Maan2016-07-041-1/+1
| | | |
| * | | Add confirmation when canceling creating/editing with changesDouwe Maan2016-07-041-0/+12
| | | |
| * | | Cancel creating or editing note by hitting EscapeDouwe Maan2016-07-041-5/+20
| | | |
* | | | Merge branch '15094-throttling-pushes_since_gc' into 'master' Douwe Maan2016-07-061-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throttle the update of `project.pushes_since_gc` to 1 minute ## What does this MR do? Throttle the update of `project.pushes_since_gc` to alleviate DB load ## What are the relevant issue numbers? Relates to #15094 ## 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~~ - [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 !5083
| * | | | Throttle the update of `project.pushes_since_gc` to 1 minute15094-throttling-pushes_since_gcPaco Guzman2016-07-051-2/+8
| | | | |
* | | | | Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into ↵Douwe Maan2016-07-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix diff comments not showing up in activity feed ## What does this MR do? It fixes the detection of note events to check for `Note` and `LegacyDiffNote`. ## Are there points in the code the reviewer needs to double check? No? /cc @DouweM (since I believe you introduced `LegacyDiffNote` ## Why was this MR needed? To fix #19092. ## What are the relevant issue numbers? Fixes #19092. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] 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 !5069
| * | | | | Use a more future-proof check for Note/LegacyDiffNote19092-fix-event-for-legacydiffnote-not-considered-noteRémy Coutable2016-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix diff comments not showing up in activity feedRémy Coutable2016-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'gh-labels' into 'master' Robert Speicher2016-07-064-13/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow `?`, or `&` for label names Closes #18727 See merge request !4724
| * | | | | | Fix unescaped strings in the labels dropdown templategh-labelsDouglas Barbosa Alexandre2016-07-061-2/+2
| | | | | | |
| * | | | | | Render label name contains ?, & in the labels dropdown without escapingDouglas Barbosa Alexandre2016-07-052-6/+5
| | | | | | |
| * | | | | | Use CGI.unescapeHTML rather than doing the gsub with a mapDouglas Barbosa Alexandre2016-07-051-11/+1
| | | | | | |
| * | | | | | Move `unescape_html_entities` from LabelsHelper to Label modelDouglas Barbosa Alexandre2016-07-052-12/+12
| | | | | | |
| * | | | | | Render references for labels that name contains ?, or &Douglas Barbosa Alexandre2016-07-053-15/+15
| | | | | | |
| * | | | | | Allow '?', or '&' for label titlesDouglas Barbosa Alexandre2016-07-052-5/+19
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-062-3/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing URL validation for import_url on projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17536 This MR fixes problems related to bypassing `import_url` validation on projects. This makes sure the URL is properly validated so we don't enter crap and fail while running workers that handle this URL. It also adds a migration to fix current invalid `import_url`s See merge request !4753
| * | | | | | refactor url validator to use sanitizer for checkfix/import-url-validatorJames Lopez2016-07-011-3/+1
| | | | | | |
| * | | | | | few more changes from suggestionsJames Lopez2016-06-301-1/+0
| | | | | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-06-30103-319/+625
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/import-url-validator # Conflicts: # spec/models/project_spec.rb
| * | | | | | | few changes based on feedbackJames Lopez2016-06-302-10/+7
| | | | | | | |
| * | | | | | | fix merge conflictsJames Lopez2016-06-2886-356/+450
| |\ \ \ \ \ \ \
| * | | | | | | | added more info on how addressable URI differs from what we use in UrlValidatorJames Lopez2016-06-241-1/+3
| | | | | | | | |
| * | | | | | | | updated validator based on feedbackJames Lopez2016-06-231-3/+3
| | | | | | | | |
| * | | | | | | | another fix and fixed specJames Lopez2016-06-221-0/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-06-22132-732/+1200
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/import-url-validator
| * | | | | | | | | fix commentJames Lopez2016-06-201-1/+1
| | | | | | | | | |
| * | | | | | | | | fixed a few MySQL issues and added changelogJames Lopez2016-06-201-3/+3
| | | | | | | | | |
| * | | | | | | | | started working on a migration for projects that have current import_url issuesJames Lopez2016-06-201-7/+7
| | | | | | | | | |
| * | | | | | | | | fix addressable url validatorJames Lopez2016-06-201-7/+7
| | | | | | | | | |
| * | | | | | | | | Merge branches 'fix/import-url-validator' and 'master' of ↵James Lopez2016-06-20132-594/+1679
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into fix/import-url-validator
| * | | | | | | | | | fixing URL validation for import_url on projectsJames Lopez2016-06-172-3/+50
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/project-export-error' into 'master' Rémy Coutable2016-07-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more debug info to import/export and memory killer This should help debug https://gitlab.com/gitlab-org/gitlab-ce/issues/19124 further See merge request !5108
View Lorry Controller Status