summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Implement search of code via git grepsearch-git-grepDmitriy Zaporozhets2015-07-102-0/+35
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Smaller font and leing height for sidebar elementsDmitriy Zaporozhets2015-07-101-6/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make edit/remove label buttons smallerlabels-small-buttonsDmitriy Zaporozhets2015-07-101-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fork_visibility_level' into 'master'Dmitriy Zaporozhets2015-07-104-1/+18
|\ | | | | | | | | | | | | | | Forks should not have more permissive visibility levels than the original https://dev.gitlab.org/gitlab/gitlabhq/issues/2286 See merge request !936
| * Fork visibility level fixfork_visibility_levelValery Sizov2015-07-064-1/+18
| |
* | Merge branch 'hierarchical-navigation'Dmitriy Zaporozhets2015-07-103-1/+32
|\ \
| * | Better name for group tabhierarchical-navigationDmitriy Zaporozhets2015-07-101-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Make left menu more hierarchical and less contextual by adding back item at topDmitriy Zaporozhets2015-07-103-0/+31
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix missing avatar in event feed when created projectDmitriy Zaporozhets2015-07-101-0/+1
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'comment-box-changes' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-104-6/+12
|\ \
| * | Fixed the issuescomment-box-changesDarby2015-07-093-3/+4
| | |
| * | Comment box/Placeholder text redoDarby2015-07-014-6/+11
| | |
* | | Reset ul list style types inside notesrs-issue-1939Robert Speicher2015-07-091-0/+16
| | | | | | | | | | | | Closes #259
* | | Style all blockquote children, not just pRobert Speicher2015-07-091-1/+1
| | | | | | | | | | | | Closes #1939
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-092-1/+6
|\ \ \
| * | | Cache readme rendering resultDmitriy Zaporozhets2015-07-092-1/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-07-091-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #9438 from bbodenmiller/patch-3Dmitriy Zaporozhets2015-07-091-1/+1
| |\ \ \ \ | | |/ / / | |/| | | dont -> don't
| | * | | dont -> don'tBen Bodenmiller2015-07-071-1/+1
| | | | | | | | | | | | | | | Update "You dont have any authorized applications" to "You don't have any authorized applications"
* | | | | Merge branch 'edit-readme' into 'master' Dmitriy Zaporozhets2015-07-091-4/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show edit readme from project home page I added pencil icon which redirect you to edit README page (web editor). In this case people can make changes to README easily without going to Files tab, searching for README and pressing edit button here cc @job @darby Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1892
| * | | | Show edit readme from project home pageDmitriy Zaporozhets2015-07-091-4/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'project-home-page'Dmitriy Zaporozhets2015-07-098-4/+29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Show last push widget on several project pagesDmitriy Zaporozhets2015-07-088-4/+29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Properly render plain readmeDmitriy Zaporozhets2015-07-092-0/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Add star icon to star buttonDmitriy Zaporozhets2015-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'rs-remove-task-states' into 'master'Dmitriy Zaporozhets2015-07-092-19/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused `task_[un]check` states from Update services These were left over from the old Task handling. See merge request !942
| * | | | | Simplify Issue and MergeRequest UpdateServicesrs-remove-task-statesRobert Speicher2015-07-082-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | Now that those pesky task states are gone, these become a lot simpler.
| * | | | | Remove unused `task_[un]check` states from Update servicesRobert Speicher2015-07-082-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | These were left over from the old Task handling.
* | | | | | Merge branch 'rs-issue-1750' into 'master'Dmitriy Zaporozhets2015-07-091-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure `@sort` is set by set_filters_params Closes #1750 See merge request !943
| * | | | | | Ensure `@sort` is set by set_filters_paramsrs-issue-1750Robert Speicher2015-07-081-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Closes #1750
* | | | | | Merge branch 'rs-dev-issue-2372' into 'master'Dmitriy Zaporozhets2015-07-084-4/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter by issues/merge requests without a milestone Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2372 See merge request !886
| * | | | | | Rename NoMilestone to Milestone::NoneRobert Speicher2015-07-064-22/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also refactors IssuableFinder to avoid redundant title check.
| * | | | | | Allow user to filter by Issues/Merge Requests without a MilestoneRobert Speicher2015-07-064-4/+28
| | | | | | |
* | | | | | | Merge branch 'project-home-page' into 'master'Dmitriy Zaporozhets2015-07-0819-324/+244
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New project home page ## Why? Because current project page is overloaded with information ## Changes * move activity to separate tab * make project show page cleaner by removing redundant information * render README as main content of project page cc @sytses @JobV See merge request !938
| * | | | | Cleanup and some test fixes after refactoring project home pageDmitriy Zaporozhets2015-07-083-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Recommend user to create README file for both empty and existing projectDmitriy Zaporozhets2015-07-083-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Imrpove mobile view for project pageDmitriy Zaporozhets2015-07-082-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add shortcut for project activity pageDmitriy Zaporozhets2015-07-084-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Refactor star and fork buttonsDmitriy Zaporozhets2015-07-087-83/+54
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add spacing around buttons on project pageDmitriy Zaporozhets2015-07-071-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add download button to project pageDmitriy Zaporozhets2015-07-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Move project activity to separate tab. Add more features to project home pageDmitriy Zaporozhets2015-07-0710-155/+68
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Redesign project home pageDmitriy Zaporozhets2015-07-075-95/+110
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'patch-1' into 'master'Robert Schilling2015-07-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Transfer project input width. Hi, On the **Transfer project** box of project settings page, the **Namespace** input is wider than other inputs. This PR set the `col-sm-*` css-class of the container to the same as other inputs. ## Screenshots Before ![before](https://gitlab.com/Metalaka/gitlab-ce/uploads/9b3e4ad07d1a199d3e1ee7e3ec1e5014/before.jpg) After ![after](https://gitlab.com/Metalaka/gitlab-ce/uploads/8a4e87fa73a028a9ac814bdbbc6dcab3/after.jpg) See merge request !940
| * | | | | Fix Transfer project input width.Metalaka2015-07-071-1/+1
| |/ / / /
* | | | | Merge branch 'fix-irker-capitalization' into 'master'Robert Schilling2015-07-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | Change "Irc Uri" -> "IRC URI" See merge request !937
| * | | | Change "Irc Uri" -> "IRC URI"Stan Hu2015-07-071-1/+1
| |/ / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-075-18/+29
|\ \ \ \ | |/ / /
| * | | Return 40x error codes if branch could not be deleted in UIStan Hu2015-07-061-2/+2
| | | |
| * | | Merge branch 'graphs-branch-switching' into 'master'Stan Hu2015-07-064-16/+27
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ref switching support for graphs It is now possible to view contributor and commit statistics for refs beyond the default branch. While the Git ref already was part of the path it has not been used before. Additionally, the code in RefsController#switch has been slighliy refactored since it would have become confusing with additional if-else branches added. See merge request !932