| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Rename `CommitRange#sha_from_as_param` to `#suffixed_sha_from`rs-refactor-reference-extractor | Robert Speicher | 2015-04-25 | 1 | -4/+4 |
| | | |||||
| * | Rename `CommitRange#inclusive?` to `#exclude_start?` | Robert Speicher | 2015-04-25 | 1 | -14/+12 |
| | | |||||
| * | Remove CommitRange#to_a | Robert Speicher | 2015-04-25 | 1 | -13/+0 |
| | | |||||
| * | Include caret in CommitRange#reference_title | Robert Speicher | 2015-04-25 | 1 | -1/+1 |
| | | |||||
| * | Remove param from CommitRange#to_s | Robert Speicher | 2015-04-25 | 1 | -6/+2 |
| | | |||||
| * | CommitRange improvements | Robert Speicher | 2015-04-25 | 1 | -14/+11 |
| | | |||||
| * | Add CommitRange class | Robert Speicher | 2015-04-25 | 1 | -0/+128 |
| | | |||||
| * | Merge branch 'fix-slack-channel-in-admin-settings' into 'master' | Douwe Maan | 2015-04-24 | 2 | -20/+10 |
| |\ | | | | | | | | | | | | | | | | | | | | | Fix bug where Slack service channel was not saved in admin template settings Consolidate allowed parameters in one place to avoid these kinds of bugs in the future. Closes https://github.com/gitlabhq/gitlabhq/issues/9181 Closes #1501 See merge request !574 | ||||
| | * | Fix bug where Slack service channel was not saved in admin template settings. | Stan Hu | 2015-04-24 | 2 | -20/+10 |
| | | | | | | | | | | | | | Consolidate allowed parameters in one place to avoid these kinds of bugs in the future. Closes https://github.com/gitlabhq/gitlabhq/issues/9181 | ||||
| * | | Merge branch 'rs-simplify-uploads-controller' into 'master' | Robert Speicher | 2015-04-24 | 1 | -5/+2 |
| |\ \ | | | | | | | | | | | | | | | | Simplify the `skip_before_action` logic for UploadsController See merge request !547 | ||||
| | * | | Simplify the `skip_before_filter` logic for UploadsControllerrs-simplify-uploads-controller | Robert Speicher | 2015-04-23 | 1 | -5/+2 |
| | | | | |||||
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-24 | 4 | -32/+67 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'mobile-ui-improvements' into 'master' | Dmitriy Zaporozhets | 2015-04-24 | 4 | -32/+67 |
| | |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve mobile UI for dashboard and project pages Some love for mobile UI :smiley: ## Before - - -   ## After - - -   Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !573 | ||||
| | | * | | Improve mobile UI for dashboard and project pages | Dmitriy Zaporozhets | 2015-04-24 | 4 | -32/+67 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Merge branch 'username-period-again' into 'master' | Douwe Maan | 2015-04-24 | 1 | -1/+10 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow username to end in period. Fixes #2174 and #2249. cc @jacobvosmaer Please review and test with the GitLab.com dump. See merge request !1786 | ||||
| | * | | | Revert "Rename namespace_regex to namespace_path_regex." | Douwe Maan | 2015-04-24 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | This reverts commit c0116926c743818b2593474946abb40b56d8fefa. | ||||
| | * | | | Explain namespace clearn regex. | Douwe Maan | 2015-04-24 | 1 | -0/+5 |
| | | | | | |||||
| | * | | | Properly migrate users with usernames like "." or "..". | Douwe Maan | 2015-04-24 | 1 | -1/+5 |
| | | | | | |||||
| | * | | | Rename namespace_regex to namespace_path_regex. | Douwe Maan | 2015-04-24 | 2 | -4/+4 |
| | |/ / | |||||
| * | | | Merge branch 'add_count_to_state_filters' into 'master' | Marin Jankovski | 2015-04-24 | 2 | -3/+17 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Add issue and merge request count for state filters. Related to issue #2170 Changes relate to project issues and merge request pages, dashboard and group pages remain the same. See merge request !1747 | ||||
| | * | | Check if project before calling count on issuable. | Marin Jankovski | 2015-04-24 | 1 | -1/+3 |
| | | | | |||||
| | * | | Add issue and merge request count for state filters. | Marin Jankovski | 2015-04-24 | 2 | -3/+15 |
| | | | | |||||
| * | | | Merge branch 'commit-project' into 'master' | Douwe Maan | 2015-04-24 | 27 | -136/+148 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link cross-project cross-reference notes to correct project. - Fixes #1431: Don't crash when an MR from a fork has a cross-reference comment from the target project on of its commits. - Include commit comments in MR from a forked project. To accomplish this, the Commit model needs to know about its project. Adding this attribute also simplifies a bunch of other methods that deal with a note's target, that previously had to have special logic for when it belonged to a commit. See merge request !554 | ||||
| | * | | | Explain purpose and usage. | Douwe Maan | 2015-04-24 | 1 | -0/+24 |
| | | | | | |||||
| | * | | | Fix behavior for Enumerable-like ActiveRecord relations. | Douwe Maan | 2015-04-24 | 1 | -3/+1 |
| | | | | | |||||
| | * | | | Fix small issues. | Douwe Maan | 2015-04-24 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Satisfy Rubocop. | Douwe Maan | 2015-04-24 | 1 | -11/+12 |
| | | | | | |||||
| | * | | | Fix errors. | Douwe Maan | 2015-04-24 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Select MR commit notes from source project. | Douwe Maan | 2015-04-24 | 1 | -3/+6 |
| | | | | | |||||
| | * | | | Move participants method to shared Participable concern. | Douwe Maan | 2015-04-24 | 5 | -43/+51 |
| | | | | | |||||
| | * | | | Link cross-project cross-reference notes to correct project. | Douwe Maan | 2015-04-24 | 5 | -40/+15 |
| | | | | | |||||
| | * | | | No longer needed to pass project argument to commit methods. | Douwe Maan | 2015-04-24 | 7 | -26/+22 |
| | | | | | |||||
| | * | | | Use project.commit convenience method. | Douwe Maan | 2015-04-24 | 8 | -9/+9 |
| | | | | | |||||
| | * | | | Let commit model know about its project. | Douwe Maan | 2015-04-24 | 10 | -22/+29 |
| | |/ / | |||||
| * | | | Merge pull request #9065 from rumpelsepp/issues | Dmitriy Zaporozhets | 2015-04-24 | 4 | -46/+39 |
| |\ \ \ | |/ / |/| | | Tweak issue page a bit | ||||
| | * | | Tweak merge requests | Stefan Tatschner | 2015-04-24 | 2 | -15/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Include creation time * Include author without avatar * Move assignee to the right * Include comments counter by default, gray it out when there are 0 comments. | ||||
| | * | | Tweak issue page | Stefan Tatschner | 2015-04-24 | 2 | -31/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Include creation time * Include author without avatar * Move assignee to the right * Remove action buttons. IMO they are useless and a bit annoying * Include comments counter by default, gray it out when there are 0 comments. | ||||
| * | | | Merge branch 'atom-feeds-everywhere' into 'master' | Dmitriy Zaporozhets | 2015-04-24 | 21 | -53/+127 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Add project activity atom feed and show atom feed buttons everywhere where applicable. See merge request !555 | ||||
| | * | | | Remove unnecessary private_token params.atom-feeds-everywhere | Douwe Maan | 2015-04-23 | 7 | -7/+7 |
| | | | | | |||||
| | * | | | Rename "News Feed" buttons to "Activity Feed" | Douwe Maan | 2015-04-23 | 3 | -3/+3 |
| | | | | | |||||
| | * | | | Fix project atom link tag. | Douwe Maan | 2015-04-23 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Make links and titles of atom feeds consistent. | Douwe Maan | 2015-04-23 | 11 | -31/+31 |
| | | | | | |||||
| | * | | | Add atom feed for project activity. | Douwe Maan | 2015-04-23 | 3 | -5/+37 |
| | | | | | |||||
| | * | | | Move activity feed buttons out of event_filter into actual show views. | Douwe Maan | 2015-04-23 | 4 | -14/+20 |
| | | | | | |||||
| | * | | | Add feed button to dashboard and group issue pages. | Douwe Maan | 2015-04-23 | 2 | -0/+12 |
| | | | | | |||||
| | * | | | Add atom link tag to every page that has one. | Douwe Maan | 2015-04-23 | 9 | -10/+34 |
| | | | | | |||||
| * | | | | Fix align of issue status box with close/edit buttons to the right | Dmitriy Zaporozhets | 2015-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-24 | 1 | -23/+24 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'rs-update-d3-atwho' into 'master' | Robert Speicher | 2015-04-23 | 1 | -23/+24 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update d3_rails and jquery-atwho-rails We were a bit behind on these JS libs, so this updates them. AtWho made a few API changes for which I had to update our usage. Should fix #1457 as well. See merge request !542 | ||||
| | | * | | | | Fix GfmAutoComplete for jquery-atwho 1.0rs-update-d3-atwho | Robert Speicher | 2015-04-23 | 1 | -23/+24 |
| | | | |_|/ | | |/| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |