summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge pull request #9730 from ImanMh/masterDmitriy Zaporozhets2015-11-061-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ugly outlines removed form sidebar
| | * | | | | | | | | | ugly outlines removed form sidebarIman Mohamadi2015-10-141-0/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #9788 from Thirumal-Sakthivel/select_box_uiDmitriy Zaporozhets2015-11-063-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | form-control class added to select box
| | * | | | | | | | | | | defined class prepend-top-10 used for alignment issueThirumal S2015-11-052-5/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | merge conflict fixedThirumal S2015-11-03517-3823/+7792
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | form group alignment issue fixed in webhook index pageThirumal S2015-10-302-1/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | form-control class to select boxThirumal S2015-10-301-1/+1
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #9804 from ↵Dmitriy Zaporozhets2015-11-051-8/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trimentor/9722-fix-alignment-of-event-items-and-its-children 9722 fix alignment of event items and its children
| | * | | | | | | | | | Add right margin to event-body..Kjel Delaey2015-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise text will flow under the "timeago" element. The original value was 80px (see commit 8b0906c8), but a value of 174px makes more sense. (see event-title `calc` function).
| | * | | | | | | | | | Make sure that multi-commit rows inside event bodies are aligned properly..Kjel Delaey2015-11-041-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent the second, third, ... rows from having a different indentation than the first commit row. Adding the extra "15px padding" to the event item prevents this. Having a 15px margin on the avatar only doesn't prevent this from happening.
| | * | | | | | | | | | Combine selectors because the same style is being appliedKjel Delaey2015-11-041-4/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Apply the same rules to block event items..Kjel Delaey2015-11-041-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to avoid alignment issues as well.
| | * | | | | | | | | | Style inline event items with titles containing long words properly..Kjel Delaey2015-11-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a tablet in portrait mode with a width of 768px the event-title isn't aligned properly when the title contains a long string. This also happens when resizing your browser viewport on a desktop. Example string: Administrator pushed new branch feature-branch-with-a-very-long-name at Gitlab Org / Gitlab Test In the UI it would look like the example below: ---------- | | | AVATAR | less than a minute ago | | ---------- Administrator pushed new branch feature-branch-with-a-very-long-name at...
* | | | | | | | | | | | Merge branch 'one-link-in-emails' into 'master' Dmitriy Zaporozhets2015-11-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only have one link in emails to make clicking it easier. See merge request !1937
| * | | | | | | | | | Only have one link in emails to make clicking it easier.Sytse Sijbrandij2015-11-051-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'update-ci-settings' into 'master' Achilleas Pipinellis2015-11-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update example of regex for pytest-cov See merge request !1745
| | * | | | | | | | | update example of regex for pytest-covmozillazg2015-11-041-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #9805 from mutec/patch-1Robert Schilling2015-11-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | fixed typo in installation manual
| * | | | | | | | | | Update installation.mdmutec2015-11-041-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Use single spacesSytse Sijbrandij2015-11-041-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'facebook-auth' into 'master' Robert Speicher2015-11-0412-14/+125
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Facebook authentication See merge request !1740
| * | | | | | | | | Minor reformatting for Facebook integration docfacebook-authRobert Speicher2015-11-031-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | Use proper labels for OAuth providersDouwe Maan2015-11-031-1/+8
| | | | | | | | | |
| * | | | | | | | | Add Facebook authenticationDouwe Maan2015-11-0311-13/+116
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs-git-bin-path' into 'master' Douwe Maan2015-11-0412-36/+46
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace all usages of `git` command with configurable binary path Closes #3311 See merge request !1742
| * | | | | | | | Replace all usages of `git` command with configurable binary pathrs-git-bin-pathRobert Speicher2015-11-0311-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3311
| * | | | | | | | Update Shell Commands doc for configurable git binary pathRobert Speicher2015-11-031-5/+15
| |/ / / / / / /
* | | | | | | | Merge branch 'fix-infinite-redirect' into 'master' Stan Hu2015-11-041-7/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only redirect to homepage url when its not the root url It was possible to create an infi redirect when the user set up the `home_page_url` to redirect to the main URL of the gitlab instance. This fix makes sure this redirect is not possible. Fixes #1020 /cc @dblessing See merge request !1703
| * | | | | | | | Only redirect to homepage url when its not the root urlJeroen van Baarsen2015-11-021-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was possible to create an infi redirect when the user set up the `home_page_url` to redirect to the main URL of the gitlab instance. This fix makes sure this redirect is not possible. Fixes !1020 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | | | | | Merge branch 'improve-profile-page' into 'master' Dmitriy Zaporozhets2015-11-045-9/+26
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to profile page UI * add separator between tabs * show project avatars * fix tooltip offset on user calendar * remove gray hover for tabs Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #3042 See merge request !1747
| * | | | | | | | Improvements to profile page UIimprove-profile-pageDmitriy Zaporozhets2015-11-045-9/+26
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add separator between tabs * show project avatars * fix tooltip offset on user calendar * remove gray hover for tabs Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'create-project-performance' into 'master' Yorick Peterse2015-11-044-2/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of creating projects See merge request !1650
| * | | | | | | | Removed extra activity update for new projectscreate-project-performanceYorick Peterse2015-10-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is created the last activity timestamp is already set so there's no need for another update.
| * | | | | | | | Added benchmark for Projects::CreateServiceYorick Peterse2015-10-291-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This benchmark currently runs at ~0.6 iterations per second and is unlikely to perform any better any time soon.
| * | | | | | | | Added index on services.templateYorick Peterse2015-10-292-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This column is queried when creating a new project, without an index this query would lead to a sequence scan.
* | | | | | | | | Merge branch 'remove-duplicate-orders' into 'master' Yorick Peterse2015-11-043-11/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate orders This changes the default order from `created_at DESC, id DESC` to just `id DESC` as this achieves the same results without the overhead of having to sort data twice (we've seen queries go from 200ms to just a few ms by removing the double sort). cc @jacobvosmaer @dzaporozhets @rspeicher @DouweM See merge request !1735
| * | | | | | | | | Fixed User sorting specsremove-duplicate-ordersYorick Peterse2015-11-031-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The descriptions were not accurate and one particular spec seemingly expected the wrong User row to be returned.
| * | | | | | | | | Only sort by IDs by defaultYorick Peterse2015-11-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting by both "created_at" and "id" in descending order is not needed as simply sorting by "id" in descending order will already sort rows from new to old. Depending on the query and data involved sorting twice can also introduce significant overhead.
| * | | | | | | | | Added benchmark for User.allYorick Peterse2015-11-031-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This benchmark exists to test if ordering has any noticeable impact in the test environment.
* | | | | | | | | | Merge branch 'rs-update-stamp' into 'master' Dmitriy Zaporozhets2015-11-042-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump stamp to ~> 0.6.0 Closes #2801 See merge request !1732
| * | | | | | | | | Bump stamp to ~> 0.6.0rs-update-stampRobert Speicher2015-11-032-3/+3
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2801
* | | | | | | | | Merge branch 'improve-profile-page'Dmitriy Zaporozhets2015-11-039-50/+109
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add extra padding between user description and links on profile pageDmitriy Zaporozhets2015-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Fix testsDmitriy Zaporozhets2015-11-032-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Apply new design for user profile pageDmitriy Zaporozhets2015-11-036-33/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Improve profile page UIDmitriy Zaporozhets2015-11-032-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | Merge branch 'spread-runner-last-updated-at' into 'master' Robert Speicher2015-11-032-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spread out runner contacted_at updates This is meant to prevent having too many concurrent UPDATE requests caused by runners checking in. See merge request !1722
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵spread-runner-last-updated-atJacob Vosmaer2015-11-0327-150/+347
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | spread-runner-last-updated-at
| * | | | | | | | | | Add changelog entry for contacted_atJacob Vosmaer2015-11-021-0/+3
| | | | | | | | | | |
View Lorry Controller Status