Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2016-07-07Fix invite user feature test and improve request member UI rowDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-07Improve UI for member row on project/group members pagesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-07Add data when member joined a teamValery Sizov
2016-07-07Merge branch 'services_refactoring1' into 'master' Dmitriy Zaporozhets
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
2016-07-07Merge branch 'show_push_widget_in_upstream' into 'master' Rémy Coutable
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
2016-07-07Merge branch 'patch-3' into 'master' Rémy Coutable
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
2016-07-07Merge branch 'build-auto-refresh' into 'master' Jacob Schatz
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
2016-07-07Merge branch '18283-pluralize-stage-headings' into 'master' Jacob Schatz
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
2016-07-07Merge branch '18858-options-dropdown-on-mobile-should-be-full-width' into ↵Jacob Schatz
'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
2016-07-06Show last push widget in upstream after push to forkDrew Blessing
2016-07-06Services: code style fixes, minor refactoringValery Sizov
2016-07-06Allow everyone to sort tags, not only those who has accessSerg
2016-07-06Merge branch 'escape-to-cancel-note' into 'master' Jacob Schatz
Cancel creating or editing note by hitting Escape /cc @rspeicher See merge request !5075
2016-07-06Get rid of pluralize on stage namesAnnabel Dunstone
2016-07-06Merge branch '15094-throttling-pushes_since_gc' into 'master' Douwe Maan
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
2016-07-06Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into ↵Douwe Maan
'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
2016-07-06Merge branch 'gh-labels' into 'master' Robert Speicher
Allow `?`, or `&` for label names Closes #18727 See merge request !4724
2016-07-06Merge branch 'fix/import-url-validator' into 'master' Robert Speicher
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
2016-07-06Merge branch 'fix/project-export-error' into 'master' Rémy Coutable
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
2016-07-06Fixed issue with build auto-refresh not workingPhil Hughes
2016-07-06Use a more future-proof check for Note/LegacyDiffNoteRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-06Fix unescaped strings in the labels dropdown templateDouglas Barbosa Alexandre
2016-07-06Render label name contains ?, & in the labels dropdown without escapingDouglas Barbosa Alexandre
2016-07-06Use CGI.unescapeHTML rather than doing the gsub with a mapDouglas Barbosa Alexandre
2016-07-06Move `unescape_html_entities` from LabelsHelper to Label modelDouglas Barbosa Alexandre
2016-07-06Render references for labels that name contains ?, or &Douglas Barbosa Alexandre
2016-07-06Allow '?', or '&' for label titlesDouglas Barbosa Alexandre
2016-07-06Use keyword arguments for boolean values and use `span` instead of `a` for ↵Patricio Cano
clone "button"
2016-07-06Revert back to not defining a default Git access protocol.Patricio Cano
2016-07-06Rebasing caused `enabled_git_access_protocol` to become plural. Fixed here.Patricio Cano
2016-07-06Clone button should not be clickable when there is a disabled protocolPatricio Cano
2016-07-06Default Git access protocol to `web`Patricio Cano
2016-07-06Rename `enabled_git_access_protocols` to singular.Patricio Cano
2016-07-06Correct access control flow for Git HTTP requests.Patricio Cano
2016-07-06Clarify protocol access check, and make Git HTTP access call more specific.Patricio Cano
2016-07-06Render the status message with `plain:` so that the message gets passed to ↵Patricio Cano
the Git client.
2016-07-06Render :forbidden *only* if HTTP is disabled.Patricio Cano
2016-07-06Return :forbidden if HTTP protocol access is not allowedPatricio Cano
2016-07-06Simplify access checksPatricio Cano
2016-07-06Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell ↵Patricio Cano
expects and make the `protocol` param in `GitAccess` mandatory.
2016-07-06Only allow Git Access on the allowed protocolPatricio Cano
2016-07-06Refactor clone button sanitation to its own method to avoid duplication.Patricio Cano
2016-07-06Fix CSSPatricio Cano
2016-07-06Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano
2016-07-06Merge branch '19161-non-helpful-flash-message-when-attaching-file-fails' ↵Fatih Acet
into 'master' Hacked in a better message for attachment network error ## What does this MR do? Adds a better error message for when a user is uploading an attachment and they cannot reach the GitLab instance. Now displays `Network error. Please check your connection.`. ## Are there points in the code the reviewer needs to double check? As noted above, I think this is hacky, ideally this would be sent straight from the backend but if not then this should be handled globally? /cc @fatihacet ## Why was this MR needed? Attachment upload UX ## What are the relevant issue numbers? Closes #19161. ## Screenshots (if relevant) *UPDATED:* ![Screen_Shot_2016-06-30_at_00.42.37](/uploads/b3b4044782dd4c4c17735e99acc45502/Screen_Shot_2016-06-30_at_00.42.37.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 - [ ] 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 !4977
2016-07-06Use switch/when statementDouwe Maan
2016-07-06Merge branch 'underscore-templates' into 'master' Jacob Schatz
Naive attempt at fixing Underscore templates ## What does this MR do? Attempts to fix part of #18939. ## Are there points in the code the reviewer needs to double check? That this doesn't break anything. ## Why was this MR needed? See #18939. ## What are the relevant issue numbers? #18939 ## Does this MR meet the acceptance criteria? - Tests - [ ] Added for this feature/bug - [ ] All builds are passing See merge request !4842
2016-07-05Merge branch 'ff-markdown-buttons-fix' into 'master' Jacob Schatz
Fixed markdown buttons in FF ## What does this MR do? The markdown buttons weren't working with the `execCommand` function. So it has to fallback to replacing the value in the textarea. See merge request !5085
2016-07-05Merge branch '18790-dont-show-request-button-to-project-owner' into 'master' Robert Speicher
Don't show "request access" button to project owners This MR fixes an issue where project owners that are not in the project's members list (I believe this is how we handled project owners before, now we seem to create a "Master" member for the project creator) would see the `Request Access` button. This MR fixes this issue in a clean way by adding a new `:request_access` ability to replace an ugly helper. It also give project owners the ability to update & destroy a requester that would happen to be themselves (since owners could request access to their own project before this MR). Related to #18790. See merge request !5091
2016-07-05Merge branch 'update-gemoji' into 'master' Robert Speicher
Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione - No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem? - Fixes the Rake task since it broke after all the AwardEmoji changes. - Update gemojione to 2.6.1. Spring Update changes! http://emojione.com/releases/#2.2.0 See merge request !4919
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-15 15:03:33 +0300