Commit Graph
5537 Commits
Author SHA1 Message Date
Douwe Maan 00a4be759e Page titles are title case. 2015-12-02 14:06:25 +01:00
Douwe Maan 4f7380f94e Fix header tooltip alignment 2015-12-02 14:05:58 +01:00
Douwe Maan 05224ae64a Restore sidebar tooltips and fix logo tooltip location 2015-12-02 14:05:10 +01:00
Valery Sizov e0131c5d07 Merge branch 'rails_update_to_4_2' into 'master'
Rails update to 4.2.4

https://gitlab.com/gitlab-org/gitlab-ce/issues/2694

See merge request !1902
2015-11-30 16:49:09 +00:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Dmitriy Zaporozhets c48518ac21 Merge branch 'fix-admin-page-personal-projects' into 'master'
Fix Error 500 when viewing user's personal projects from admin page

This is a regression introduced in 4d7f00f.

Closes #3680

Closes https://github.com/gitlabhq/gitlabhq/issues/9861

Closes gitlab-org/gitlab-ee#90

See merge request !1909
2015-11-30 09:18:59 +00:00
Dmitriy Zaporozhets 0a1b50ef3f Merge branch 'rs-clone-panel' into 'master'
Add clipboard button for project clone panel

Closes #3585 

Project:

![Screen_Shot_2015-11-24_at_7.34.04_PM](/uploads/8bf73a2816f2525896023c36aea402bc/Screen_Shot_2015-11-24_at_7.34.04_PM.png)

Wiki:

![Screen_Shot_2015-11-24_at_7.34.43_PM](/uploads/ddf400a1c979a1d8b535a34877cd6163/Screen_Shot_2015-11-24_at_7.34.43_PM.png)


See merge request !1896
2015-11-30 09:17:39 +00:00
Robert Speicher 3723182a88 Move project visibility level off of the clone panel 2015-11-27 16:15:06 -05:00
Stan Hu 36bde0fcb1 Fix Error 500 when viewing user's personal projects from admin page
This is a regression introduced in 4d7f00f.

Closes #3680
2015-11-25 14:00:35 -08:00
Robert Speicher 73eca2a95e Decouple Markdown previews from DropzoneInput 2015-11-25 16:36:04 -05:00
Dmitriy Zaporozhets dee28c50a9 Merge branch 'new-member-page' into 'master'
Improve group and project members pages

* Improve UI for group members page
* Improve UI for project members page

For internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2057

This MR should solve usability problem with adding new member to group/project 

See merge request !1886
2015-11-25 18:20:22 +00:00
Yorick Peterse ef2bc0f0bf Merge branch 'sherlock-total-query-time' into 'master'
Added total query time to Sherlock

This makes it easier to see if a problem is caused by slow queries or
slow Ruby code (unrelated to any SQL queries that might be used).

See merge request !1887
2015-11-25 11:29:48 +00:00
Dmitriy Zaporozhets d262daa4f0 Split group feature tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-25 11:44:39 +01:00
Dmitriy Zaporozhets 34cc8f4a60 Improve project members page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-25 10:24:29 +01:00
Dmitriy Zaporozhets d9749c8d36 Improve UI for group members page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-25 10:24:29 +01:00
Robert Speicher 1d80cd315e Add clipboard button to project clone panel
Closes #3585
2015-11-24 19:32:06 -05:00
Robert Speicher 7dab8ed739 Rework the copy_to_clipboard logic
It needed to be more flexible in how we set the target text or element.
2015-11-24 19:12:03 -05:00
Robert Speicher af65046c5f Move HTTP/SSH clone button logic to helpers 2015-11-24 16:55:26 -05:00
Dmitriy Zaporozhets 4caef63d82 Fix 500 error when update group member permission
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-24 16:13:21 +01:00
Yorick Peterse 97f8c6279f Added total query time to Sherlock
This makes it easier to see if a problem is caused by slow queries or
slow Ruby code (unrelated to any SQL queries that might be used).
2015-11-24 10:57:21 +01:00
Dmitriy Zaporozhets 1324cc2f6e Merge branch 'issue_2993' into 'master'
Update copy used in alert message when deleting branches or tags.

Reference: #2993 

Before:

![Screen_Shot_2015-11-19_at_4.10.34_PM](/uploads/5cdf7e8c5d4c6bd9e18584b118420c8c/Screen_Shot_2015-11-19_at_4.10.34_PM.png)

![Screen_Shot_2015-11-19_at_4.14.19_PM](/uploads/80513b96492122860733462efa8c8015/Screen_Shot_2015-11-19_at_4.14.19_PM.png)

After:

![Screen_Shot_2015-11-19_at_4.59.56_PM](/uploads/80367f2acea0d22d36a5297bdc29163e/Screen_Shot_2015-11-19_at_4.59.56_PM.png)

![Screen_Shot_2015-11-19_at_4.59.30_PM](/uploads/134cf02d1fb3feff2159b5659d149d54/Screen_Shot_2015-11-19_at_4.59.30_PM.png)

See merge request !1846
2015-11-23 10:56:02 +00:00
Robert Speicher 2df492fd2f Add clipboard button to merge request cross-project reference 2015-11-19 19:25:22 -05:00
Dmitriy Zaporozhets 68d4ab2381 Merge branch 'emoji_votes' into 'master'
Award Emoji

This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.

For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like "👍" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825
2015-11-19 21:34:38 +00:00
Dmitriy Zaporozhets ef1ed8f702 Merge branch 'missing_dot_confirm_modal' into 'master'
Add missing dot in confirm modal



See merge request !1645
2015-11-19 21:26:10 +00:00
Rubén Dávila 55c2a69f5f Update copy used in alert message when deleting branches or tags. #2993 2015-11-19 16:22:41 -05:00
Robert Speicher 3a85c93a7a Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'
Add option to create merge request when editing/creating a file

Replaces !1611 

Fixes #3059

See merge request !1820
2015-11-19 16:45:45 +00:00
Valery Sizov bdf4007cb7 adressing comments 2015-11-19 18:12:17 +02:00
Douwe Maan 97842cea74 Fix 'Attach a file' link in new tag form 2015-11-19 15:37:20 +01:00
Valery Sizov 23c5473cc0 added spinach tests 2015-11-19 13:20:09 +02:00
Yorick Peterse a42d469ab2 Merge branch 'atom-feed-latest-update' into 'master'
Improve performance of user profiles, finding groups, and finding projects

This MR improves the following:

* Rendering of profile pages and Atom feeds
* Finding groups (using GroupsFinder & friends)
* Finding projects (using ProjectsFinder & friends)

Initially this MR was intended to only improve rendering of Atom feeds, but over time other fixes were introduced as well as the same code was the cause of all these problems.

See merge request !1790
2015-11-19 10:05:53 +00:00
Dmitriy Zaporozhets 618b54910e Improve UI for emoji awards
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-19 10:50:38 +01:00
Valery Sizov fdd5a8f2e1 addressing comments 2015-11-19 01:26:00 +02:00
Valery Sizov 92943580cb improve style 2015-11-19 01:26:00 +02:00
Valery Sizov 23df515fd0 Emoji: fix image of emoji when it is submitted via comment 2015-11-19 01:26:00 +02:00
Valery SizovandValery Sizov d8676f18fc fix 2015-11-19 01:25:59 +02:00
Valery SizovandValery Sizov 2d1fcd802a Emoji: refactoring 2015-11-19 01:25:59 +02:00
Valery SizovandValery Sizov 2f6f99d300 award for merge requests[ci skip] 2015-11-19 01:25:59 +02:00
Valery SizovandValery Sizov f021bc5c6a add stats on hover 2015-11-19 01:25:59 +02:00
Valery Sizov 36d0442e83 replace emoji references from class name to data [ci skip] 2015-11-19 01:25:59 +02:00
Valery Sizov 06a4fd1035 css improvements 2015-11-19 01:25:59 +02:00
Valery Sizov fd2c0fe446 award emoji 2015-11-19 01:25:27 +02:00
Yorick Peterse 054f2f98ed Faster way of obtaining latest event update time
Instead of using MAX(events.updated_at) we can simply sort the events in
descending order by the "id" column and grab the first row. In other
words, instead of this:

    SELECT max(events.updated_at) AS max_id
    FROM events
    LEFT OUTER JOIN projects   ON projects.id   = events.project_id
    LEFT OUTER JOIN namespaces ON namespaces.id = projects.namespace_id
    WHERE events.author_id IS NOT NULL
    AND events.project_id IN (13083);

we can use this:

    SELECT events.updated_at AS max_id
    FROM events
    LEFT OUTER JOIN projects   ON projects.id   = events.project_id
    LEFT OUTER JOIN namespaces ON namespaces.id = projects.namespace_id
    WHERE events.author_id IS NOT NULL
    AND events.project_id IN (13083)
    ORDER BY events.id DESC
    LIMIT 1;

This has the benefit that on PostgreSQL a backwards index scan can be
used, which due to the "LIMIT 1" will at most process only a single row.
This in turn greatly speeds up the process of grabbing the latest update
time. This can be confirmed by looking at the query plans. The first
query produces the following plan:

    Aggregate  (cost=43779.84..43779.85 rows=1 width=12) (actual time=2142.462..2142.462 rows=1 loops=1)
      ->  Index Scan using index_events_on_project_id on events  (cost=0.43..43704.69 rows=30060 width=12) (actual time=0.033..2138.086 rows=32769 loops=1)
            Index Cond: (project_id = 13083)
            Filter: (author_id IS NOT NULL)
    Planning time: 1.248 ms
    Execution time: 2142.548 ms

The second query in turn produces the following plan:

    Limit  (cost=0.43..41.65 rows=1 width=16) (actual time=1.394..1.394 rows=1 loops=1)
      ->  Index Scan Backward using events_pkey on events  (cost=0.43..1238907.96 rows=30060 width=16) (actual time=1.394..1.394 rows=1 loops=1)
            Filter: ((author_id IS NOT NULL) AND (project_id = 13083))
            Rows Removed by Filter: 2104
    Planning time: 0.166 ms
    Execution time: 1.408 ms

According to the above plans the 2nd query is around 1500 times faster.
However, re-running the first query produces timings of around 80 ms,
making the 2nd query "only" around 55 times faster.
2015-11-18 13:02:43 +01:00
Douwe Maan 5036d8d5d5 Fix styling of import error. 2015-11-18 12:02:09 +01:00
Douwe Maan 91fdbdcde7 Add tooltips to home panel buttons. 2015-11-18 12:02:09 +01:00
Douwe Maan 01d2b1943f Move import form to partial. 2015-11-18 12:00:56 +01:00
Douwe Maan 40470975e8 Add Project#safe_import_url helper. 2015-11-18 12:00:56 +01:00
Douwe Maan 841a7c6897 Store and show reason why import failed. 2015-11-18 12:00:56 +01:00
Douwe Maan e86d53b27f Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit 2015-11-18 11:17:20 +01:00
Robert Speicher d431f3ec40 Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master'
Prevent the last owner of a group from being able to delete themselves
by 'adding' themselves as a master

Replaces !1708.

Fixes #1111.

See merge request !1815
2015-11-17 18:23:27 +00:00
Douwe Maan e945ec0280 Add "Start a new merge request" option to every commit form 2015-11-17 18:53:56 +01:00