summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix graph width on different screen sizesfix-graph-widthDmitriy Zaporozhets2015-06-111-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve project edit formDmitriy Zaporozhets2015-06-101-17/+25
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix taskable requirers-pre-rspec-3Robert Speicher2015-06-101-0/+1
|
* Add `respond_to_missing?` for Commit and RepositoryRobert Speicher2015-06-102-8/+4
| | | | | | | As of Ruby 1.9, this is the correct way to handle `respond_to?` for methods implemented by `method_missing`. See https://robots.thoughtbot.com/always-define-respond-to-missing-when-overriding
* Merge branch 'move_project_members_link' into 'master'Dmitriy Zaporozhets2015-06-094-8/+8
|\ | | | | | | | | | | | | | | Move Project Members link from Settings to main menu. Addresses #2278. See merge request !1846
| * Move Project Members link from Settings to main menu.Nicolas2015-06-094-8/+8
| | | | | | | | Addresses #2278.
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-092-1/+6
|\ \
| * \ Merge branch 'ldap-remember-me' into 'master'Dmitriy Zaporozhets2015-06-092-1/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Remember me" checkbox to LDAP signin form. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2127. See merge request !772
| | * | Add "Remember me" checkbox to LDAP signin form.ldap-remember-meDouwe Maan2015-06-052-1/+6
| | | |
* | | | Merge branch 'fix_edit_notes_form_hotkey_issue' into 'master'Douwe Maan2015-06-091-5/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Make submit hotkey available to all notes forms. Addresses #2221. See merge request !1847
| * | | Make submit hotkey available to all notes forms.Nicolas2015-06-091-5/+3
| | |/ | |/| | | | | | | Addresses #2221.
* | | Merge branch 'fix-missing-js' into 'master'Dmitriy Zaporozhets2015-06-093-4/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move page-specific JS out of head and into body. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2375. See merge request !787
| * | | Move page-specific JS out of head and into body.Douwe Maan2015-06-093-4/+5
| |/ /
* | | Correctly remove already-mentioned commits for cross referencesrs-issue-1778Robert Speicher2015-06-081-1/+7
|/ / | | | | | | Fixes #1778
* | Fix broadcast message colors to one displayed in previewDmitriy Zaporozhets2015-06-081-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove arrow to the right of project name on dashboardDmitriy Zaporozhets2015-06-082-4/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Improve UI for phonesDmitriy Zaporozhets2015-06-083-4/+20
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Dont use fixed pixel size if form controls - its bad for mobile devicesDmitriy Zaporozhets2015-06-089-18/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix header for mobilesDmitriy Zaporozhets2015-06-082-5/+13
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Dont truncate issue/mr titleDmitriy Zaporozhets2015-06-083-2/+8
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move logout buttom to top right cornerDmitriy Zaporozhets2015-06-084-18/+12
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove line under project descriptionDmitriy Zaporozhets2015-06-051-5/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix css alignment in header. Use scss variableDmitriy Zaporozhets2015-06-054-17/+16
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'refactor-web-editor' into 'master'Dmitriy Zaporozhets2015-06-056-152/+120
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor web editor * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #1761 See merge request !773
| * | Refactor web editorrefactor-web-editorDmitriy Zaporozhets2015-06-056-152/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'warn-about-referenced-users' into 'master'Dmitriy Zaporozhets2015-06-0520-60/+132
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show warning when a comment will add 10 or more people to the discussion. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2054 New issue: ![Screen_Shot_2015-06-02_at_14.48.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6771ff8748b9b548a9f0f32a5a8b9bb1/Screen_Shot_2015-06-02_at_14.48.46.png) New comment: ![Screen_Shot_2015-06-02_at_14.48.51](https://gitlab.com/gitlab-org/gitlab-ce/uploads/25ec5f06490e1e6b36e453e055a7b403/Screen_Shot_2015-06-02_at_14.48.51.png) See merge request !754
| * | | Prefer jQuery on to bind, and don't use .js class.warn-about-referenced-usersDouwe Maan2015-06-054-8/+8
| | | |
| * | | Show warning when a comment will add 10 or more people to the discussion.Douwe Maan2015-06-0520-59/+131
| |/ /
* | | Merge branch 'wip-mr-docs' into 'master'Dmitriy Zaporozhets2015-06-051-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add info about WIP merge requests to docs. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2078. See merge request !770
| * | | Add info about WIP merge requests to docs.wip-mr-docsDouwe Maan2015-06-051-3/+3
| |/ /
* | | Fix timeout when rendering file with thousands of lines.fix-long-blob-timeoutDouwe Maan2015-06-051-1/+2
| |/ |/|
* | Fix empty headerDmitriy Zaporozhets2015-06-052-1/+6
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'make-namespaces-api-available-to-all-users' into 'master'Dmitriy Zaporozhets2015-06-041-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make namespace API available to all users ### What does this MR do? This MR makes it possible for a user to query namespaces to which he/she has access. Also, it adds documentation for the existing API. ### Why was this MR needed? Even though the `groups` API exists, it might still be useful to have an endpoint that tells the namespace type (e.g. `user` vs. `group`), especially if a user has access to a number of different projects. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9328 See merge request !708
| * Make namespace API available to all usersStan Hu2015-05-281-0/+6
| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9328
* | Merge branch 'sn-push-email-plussign' into 'master'Dmitriy Zaporozhets2015-06-041-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use entity number for plus sign in push emails Was doing some testing today and found that both outlook and gmail had issues displaying the html content produced for push emails when a file was added. This is how gmail shows it: ![Gmail_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/24be115dbae97997bc02e2ec70d9870c/Gmail_name.png) And this is for Outlook: ![Outlook_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/4b5a54956139d36d78f9c61c83e99928/Outlook_name.png) iOS devices work with the &plus; entity, as does Mail on OS X, but I'm wondering if it is only available for newer html parsers (a quick browse on the w3c site seems to show that it was added in html 5). Changing the entity to `&#43;` and both gmail and outlook and iOS and Mail. See merge request !721
| * | Use entity number for plus signSteve Norman2015-05-271-1/+1
| | |
* | | Merge branch 'fix-no-labels-page' into 'master'Dmitriy Zaporozhets2015-06-041-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omit link to generate labels if user does not have access to create them On a project that has no labels, a user was provided a link to create labels on the "Labels" tab, resulting in a 404. This MR changes the next to "No labels created" if the user lands on this page but does not have permission to add a label. Screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/cb04659cf3a0abe1e072cb78d0964b94/image.png) Closes https://github.com/gitlabhq/gitlabhq/issues/8353 See merge request !752
| * | | Omit link to generate labels if user does not have access to create themStan Hu2015-06-011-1/+4
| | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/8353
* | | | Show key fingerprint on DeployKeys#indexrs-issue-1741Robert Speicher2015-06-035-15/+16
| | | | | | | | | | | | | | | | Also style all key fingerprints consistently across the app.
* | | | Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-034-59/+1
| | | |
* | | | Merge branch 'fix-group-remove' into 'master'Dmitriy Zaporozhets2015-06-037-7/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group improvements * remove projects before removing group * execute all hooks/events from project destroy when group removed * log group create/remove * delay remove of namespace directory (to prevent NFS issues) Inspired by !759 See merge request !761
| * | | | Skip repo removing whem remove user or groupDmitriy Zaporozhets2015-06-034-11/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Log group creation and removalDmitriy Zaporozhets2015-06-031-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'repo-remove' into fix-group-removeDmitriy Zaporozhets2015-06-032-23/+59
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/projects_spec.rb
| * | | | | Remove projects before group/user. Remove namespace directory asyncfix-group-removeDmitriy Zaporozhets2015-06-033-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Wrap group removal into serviceDmitriy Zaporozhets2015-06-033-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'repo-remove'Dmitriy Zaporozhets2015-06-032-23/+59
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/projects_spec.rb
| * | | | | Fix tests and increase delay time before remove repositoryDmitriy Zaporozhets2015-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Move repository when project is removedDmitriy Zaporozhets2015-06-032-23/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ths commit does next: * When we remove project we move repository to path+deleted.git * Then we schedule removal of path+deleted with sidekiq * If repository move failed we abort project removal This should help us with NFS issue when project get removed but repository stayed. The full explanation of problem is below: * rm -rf project.git * rm -rf removes project.git/objects/foo * NFS server renames foo to foo.nfsXXXX because some NFS client (think * Unicorn) still has the file open * rm -rf exits, but project.git/objects/foo.nfsXXX still exists * Unicorn closes the file, the NFS client closes the file (foo), and the * NFS server removes foo.nfsXXX * the directory project.git/objects/ still exists => problem So now we move repository and even if repository removal failed Repository directory is moved so no bugs with project removed but repository directory taken. User still able to create new project with same name. From administrator perspective you can easily find stalled repositories by searching `*+deleted.git` Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'add-resend-confirmation-email-in-profile' into 'master'Douwe Maan2015-06-031-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Resend confirmation e-mail" link in profile settings Adds a convenience link to resend the confirmation e-mail if necessary. Before, user had to logout or open an Incognito Window to do this. Screenshot: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/700e6d98e1c5b58726fbed4e52a09c06/image.png) Fixes https://github.com/gitlabhq/gitlabhq/issues/9274 See merge request !634