summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-1816-90/+52
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'improve-ui' into 'master'Dmitriy Zaporozhets2015-03-1911-76/+43
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI * Improve group rename warning * Refactor select css. Make selects same width See merge request !400
| | * | | | | | | | | Update CHANGELOG with selectbox refactoringDmitriy Zaporozhets2015-03-181-0/+1
| | | | | | | | | | |
| | * | | | | | | | | Refactor select css. Make selects same widthDmitriy Zaporozhets2015-03-189-75/+41
| | | | | | | | | | |
| | * | | | | | | | | Improve group rename warningDmitriy Zaporozhets2015-03-181-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'improve-diffs' into 'master'Dmitriy Zaporozhets2015-03-196-14/+9
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve diffs UI * replace big button with simple toggle for diff comments * replace diff stats button with link See merge request !399
| | * | | | | | | | | Add tooltip for comment toggle in diff. Add changelog item and fix testsDmitriy Zaporozhets2015-03-183-3/+4
| | | | | | | | | | |
| | * | | | | | | | | Add some space aroung diff stats blockDmitriy Zaporozhets2015-03-181-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Replace show diff button with linkDmitriy Zaporozhets2015-03-181-5/+2
| | | | | | | | | | |
| | * | | | | | | | | Improve comment toggle button in diffDmitriy Zaporozhets2015-03-182-6/+3
| |/ / / / / / / / /
* | | | | | | | | | Fix project name overflow on dashboardDmitriy Zaporozhets2015-03-184-22/+13
|/ / / / / / / / /
* | | | | | | | | Fix link to project from forkDmitriy Zaporozhets2015-03-181-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-03-181-0/+16
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #8971 from jvanbaarsen/guard-bin-stubJeroen van Baarsen2015-03-181-0/+16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Added binstub for guard
| | * | | | | | | | Added binstub for guardJeroen van Baarsen2015-03-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | | | | | | Move application setting to separate variable.Marin Jankovski2015-03-181-2/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'more-nil-visibility-fixes' into 'master'Marin Jankovski2015-03-181-1/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle nil restricted visibility settings Return `true` from `non_restricted_level?` when the `restricted_visibility_levels` setting is nil. This addresses #2154. cc @sytse See merge request !1724
| * | | | | | | | | Handle nil restricted visibility settingsVinnie Okada2015-03-181-1/+5
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return `true` from `non_restricted_level?` when the `restricted_visibility_levels` setting is nil.
* | | | | | | | | Revert "Note: add default_scope { order(created_at: :asc, id: :asc) }"Dmitriy Zaporozhets2015-03-181-1/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7602cef572fd770a06eb3d94f2aef57c2693dcb6.
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-181-0/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'api-sort-merge-request-comments' into 'master'Douwe Maan2015-03-181-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Api: sort merge_request comments Add default_scope { order(created_at: :asc, id: :asc) } in Note so comments are sorted when fetched through api. See merge request !256
| | * | | | | | | | Note: add default_scope { order(created_at: :asc, id: :asc) }Samuel Bernard2015-03-181-0/+1
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'fix-mr-push-range' into 'master'Dmitriy Zaporozhets2015-03-182-3/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix condensed range in MR push comment. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1246 In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/326#note_984907, you see that the compare page doesn't actually have 39 commits because we're using `first_new_commit^`, which is not always the same as `oldrev`. With this MR, we use `oldrev` instead, which will always work. See merge request !1721
| * | | | | | | | Fix condensed range in MR push comment.Douwe Maan2015-03-182-3/+7
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'changelog-link' into 'master'Dmitriy Zaporozhets2015-03-187-41/+106
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog, license and contribution guide links to project sidebar. If the version is known, the "Version: 7.9.0pre" button links to the changelog, otherwise a "View changelog" button is shown. ![Screen_Shot_2015-03-18_at_14.22.29](https://dev.gitlab.org/gitlab/gitlabhq/uploads/747acc018ec9a188098e0f0bc4e91cc3/Screen_Shot_2015-03-18_at_14.22.29.png) See merge request !1708
| * | | | | | | | Add license and contribution guide links to project sidebar.Douwe Maan2015-03-186-17/+65
| | | | | | | | |
| * | | | | | | | Show changelog link even if no version is known.Douwe Maan2015-03-181-3/+7
| | | | | | | | |
| * | | | | | | | Fix tree readme.Douwe Maan2015-03-181-4/+10
| | | | | | | | |
| * | | | | | | | Link project version to changelog if there is one.Douwe Maan2015-03-182-2/+10
| | | | | | | | |
| * | | | | | | | Find tree readme lazily.Douwe Maan2015-03-181-20/+19
| | | | | | | | |
| * | | | | | | | Move finding of contributing file from tree to repository.Douwe Maan2015-03-182-7/+7
| |/ / / / / / /
* | | | | | | | Merge branch 'bump-gitlab-git' into 'master'Dmitriy Zaporozhets2015-03-182-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab_git to 7.1.2 For https://dev.gitlab.org/gitlab/gitlabhq/issues/2151 See merge request !1722
| * | | | | | | | Bump gitlab_git to 7.1.2Dmitriy Zaporozhets2015-03-182-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'new-branch-commits' into 'master'Dmitriy Zaporozhets2015-03-185-12/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List new commits for newly pushed branch in activity view. When someone pushes commits, I want to see them, regardless if it's a new or existing branch. If it's a new branch, we compare with the default branch (usually master). ![Screen_Shot_2015-03-17_at_15.49.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/4cb7e0d833bc83a30197db81d4b273bc/Screen_Shot_2015-03-17_at_15.49.13.png) See merge request !1711
| * | | | | | | | List new commits for newly pushed branch in activity view.Douwe Maan2015-03-185-12/+18
| |/ / / / / / /
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-1816-59/+204
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'commit_calendar_activity' into 'master'Douwe Maan2015-03-1814-39/+202
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend commit calendar to actually show what commits were made on a date ## What does this MR do? This MR extends the commit calendar so it acutally shows what commits were made on a date and in which project. It is based on the optimizations @dzaporozhets made for the calendar. ## Are there points in the code the reviewer needs to double check? The UI and how the links are generated i guess. That feels hacky at the moment :/ ## Screenshot: ![commit_calendar_extend_display](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5bf1631660/commit_calendar_extend_display.png) I assume that i have to refactor this a bit more to make it a cleaner implementation, so please give me feedback on what needs to be changed :) See merge request !326
| | * | | | | | | Extend the commit calendar to show the actual commits for a dateHannes Rosenögger2015-03-1814-39/+202
| | |/ / / / / /
| * | | | | | | Merge branch 'line_wrap_default' into 'master'Douwe Maan2015-03-183-20/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable line wrapping per default. This MR enables line wrapping by default and removes the checkbox to toggle it. Let's be honest, noone likes horizontal scrollbars. /cc @dzaporozhets @DouweM As discussed yesterday. Please take a look. Did I miss something? The change feels to easy :smile: See merge request !396
| | * | | | | | enable line wrapping by default and remove the checkbox to change itHannes Rosenögger2015-03-183-20/+2
| |/ / / / / /
* | | | | | | Merge branch 'order_in_settings_page' into 'master'Dmitriy Zaporozhets2015-03-181-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the order of signin and signup on features page. See merge request !1720
| * | | | | | Fix the order of signin and signup on features page.Marin Jankovski2015-03-181-2/+2
|/ / / / / /
* | | | | | Merge branch 'fix_subscription' into 'master'Dmitriy Zaporozhets2015-03-182-26/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix public issue See merge request !1717
| * | | | | | fix public issueValery Sizov2015-03-182-26/+28
| | | | | | |
* | | | | | | Fix external wiki serviceDmitriy Zaporozhets2015-03-172-2/+2
| | | | | | |
* | | | | | | Merge branch 'refactor-css'Dmitriy Zaporozhets2015-03-176-769/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove to old GitLab colors for succes and primaryDmitriy Zaporozhets2015-03-173-10/+5
| | | | | | |
| * | | | | | Cleanup bootstrap variable example filerefactor-cssDmitriy Zaporozhets2015-03-171-741/+4
| | | | | | |
| * | | | | | More use of sass variables. Reject flatly gray colorsDmitriy Zaporozhets2015-03-175-24/+17
|/ / / / / /
* | | | | | Align services like in EE for easier mergingDmitriy Zaporozhets2015-03-171-4/+22
| | | | | |
View Lorry Controller Status