summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump coveralls version, remove explicit rest-client dependencyrs-update-coverallsRobert Speicher2015-07-092-12/+5
|
* Merge branch 'revert-note-query-information' into 'master'Stan Hu2015-07-092-11/+2
|\ | | | | | | | | | | | | | | Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries" This reverts commit dd4fee5fdbda07fbc09234c4b043c3c9939a6a9b. See merge request !950
| * Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries"Stan Hu2015-07-092-11/+2
|/ | | | This reverts commit dd4fee5fdbda07fbc09234c4b043c3c9939a6a9b.
* Merge branch 'note-query-information' into 'master'Stan Hu2015-07-092-2/+11
|\ | | | | | | | | | | | | | | Note query information The 'editable' field is required to be able to distinguish system-created notes from user comments. The 'upvote' and 'downvote' fields are so that endpoints don't need to duplicate GitLab's logic for what an up or downvote is. See merge request !677
| * api: add 'system', 'upvote', and 'downvote' fields to note queriesBen Boeckel2015-07-092-2/+11
|/
* Merge branch 'docker-single' into 'master'Kamil Trzciński2015-07-0911-232/+131
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docker documentation to use only one docker container I updated documentation to use only one docker container with manually specified path to the persistent data. The container is named `gitlab` and the image will be put in GitLab organisation: https://registry.hub.docker.com/u/gitlab/gitlab-ce/ - [x] Add VOLUMEs to Dockerfile - [x] Removed all other Dockerfiles (moved everything from docker/single/ to docker/) - [x] Create DockerHub repository for GitLab CE - [x] Reword README to use single image - [x] Push images (manually) to the repository - [ ] Push to GitHub - [ ] Enable Automated Build - [ ] Integrate tagging and pushing of the image with GitLab CI @JobV @sytses Please review. See merge request !909
| * Markdown fixdocker-singleKamil Trzcinski2015-07-071-1/+1
| |
| * Add note about HTTPSKamil Trzcinski2015-07-071-0/+2
| |
| * Fix port issueKamil Trzcinski2015-07-071-1/+1
| |
| * Fix port 80443 => 8443Kamil Trzcinski2015-07-061-1/+1
| |
| * Final touchesKamil Trzcinski2015-07-061-12/+12
| |
| * Update Docker documentation to use single containerKamil Trzcinski2015-07-0611-231/+125
| |
| * Added data volumes to DockerfileKamil Trzcinski2015-07-061-2/+5
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-092-1/+6
|\ \
| * \ Merge branch 'cache-readme' into 'master'Dmitriy Zaporozhets2015-07-092-1/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache readme rendering result Markdown rendering is expensive. Lets cahce result Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !947
| | * | 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-092-8/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Improve readme testsDmitriy Zaporozhets2015-07-091-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Dont check for link but for actual readme contentDmitriy Zaporozhets2015-07-091-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Show edit readme from project home pageDmitriy Zaporozhets2015-07-091-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'last-push-widget' into 'master'Dmitriy Zaporozhets2015-07-098-4/+29
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Last push widget Continue of !938. Screenshots are at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/938#note_1594727 See merge request !946
| * | | 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>
* | | | Merge branch 'plain-readme' into 'master'Dmitriy Zaporozhets2015-07-093-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly render plain readme ## Before ![Screenshot_2015-07-09_11.38.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba53ad380060eba368aed4ecc71ff4da/Screenshot_2015-07-09_11.38.16.png) ## After ![Screenshot_2015-07-09_11.37.38](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b154c5464c3f89d3ed7a0e7157ee6c58/Screenshot_2015-07-09_11.37.38.png) cc @rspeicher Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !945
| * | | | Properly render plain readmeDmitriy Zaporozhets2015-07-093-0/+26
|/ / / / | | | | | | | | | | | | 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>
* | | | Mention project page redesign in CHANGELOGDmitriy 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-0825-64/+136
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter by issues/merge requests without a milestone Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2372 See merge request !886
| * | | | | Improve features to ensure Ajax filter has actually executedrs-dev-issue-2372Stan Hu2015-07-082-6/+10
| | | | | |
| * | | | | Remove "mystery guest" from Milestone filtering featuresRobert Speicher2015-07-082-26/+18
| | | | | |
| * | | | | Use stub_application_setting in a few more specsRobert Speicher2015-07-068-29/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These specs also failed when run by themselves before this change, so we've likely got some kind of cross-test contamination going on.
| * | | | | Add `feature` tag to feature specsRobert Speicher2015-07-0610-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not to be confused with the RSpec `type: :feature` tag, this tag is used by the `spec:feature` Rake task for filtering/grouping specs.
| * | | | | Rename NoMilestone to Milestone::NoneRobert Speicher2015-07-066-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | Also refactors IssuableFinder to avoid redundant title check.
| * | | | | Remove duplicate feature spec for filtering issues by no milestoneRobert Speicher2015-07-061-16/+0
| | | | | |
| * | | | | Allow user to filter by Issues/Merge Requests without a MilestoneRobert Speicher2015-07-066-4/+104
| | | | | |
| * | | | | Bump capybara to 2.4.0Robert Speicher2015-07-062-4/+4
| | | | | |
| * | | | | Bump select2-rails versionRobert Speicher2015-07-062-3/+3
| | | | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-0832-346/+287
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'project-home-page' into 'master'Dmitriy Zaporozhets2015-07-0830-344/+281
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Fix project testsproject-home-pageDmitriy Zaporozhets2015-07-082-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Fix creating file in new repoDmitriy Zaporozhets2015-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Fix schortcut testsDmitriy Zaporozhets2015-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status