Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | SubmoduleHelper - Project is not always available as an instance variable49061-submodule-helper-fix | Mario de la Ossa | 2018-07-15 | 1 | -13/+8 |
| | |||||
* | Merge branch 'dz-manifest-import' into 'master' | Douwe Maan | 2018-07-12 | 1 | -0/+10 |
|\ | | | | | | | | | Add manifest import See merge request gitlab-org/gitlab-ce!20304 | ||||
| * | More reliable manifest parser and group-only selector | Dmitriy Zaporozhets | 2018-07-11 | 1 | -0/+10 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Revert "Merge branch 'ee-5481-epic-todos' into 'master'" | Jarka Kadlecová | 2018-07-11 | 1 | -21/+0 |
| | | | | | | | | | | This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489. | ||||
* | | Resolve "Rename the `Master` role to `Maintainer`" Backend | Mark Chao | 2018-07-11 | 2 | -9/+9 |
|/ | |||||
* | Update time_helper.rb to fix output for exact minutes. | Marcel Amirault | 2018-07-10 | 1 | -4/+6 |
| | |||||
* | Use stable gitlab-styles and eliminate offenses | Lin Jen-Shin | 2018-07-09 | 1 | -2/+2 |
| | |||||
* | Use proper markdown rendering for previews | Brett Walker | 2018-07-06 | 2 | -3/+19 |
| | |||||
* | Merge branch 'bvl-wrap-cross-project-group-permissions' into 'master' | Douwe Maan | 2018-07-06 | 1 | -2/+6 |
|\ | | | | | | | | | Create cross project group features See merge request gitlab-org/gitlab-ce!20333 | ||||
| * | Create cross project group features | Bob Van Landuyt | 2018-07-06 | 1 | -2/+6 |
| | | | | | | | | | | This allows us to check specific abilities in views, while still enabling/disabling them at once. | ||||
* | | Fix User role displayed on projects dashboard | Francisco Javier López | 2018-07-06 | 1 | -0/+5 |
|/ | |||||
* | Move group_dropdown_label to ce helper | Jarka Kadlecová | 2018-07-04 | 1 | -0/+21 |
| | |||||
* | Performance Improvements to Vue MR page | Tim Zallmann | 2018-06-30 | 1 | -1/+1 |
| | |||||
* | Fix merge requests data source key to be camelCase | Kushal Pandya | 2018-06-27 | 1 | -1/+1 |
| | |||||
* | HTML escape the name of the user in ProjectsHelper#link_to_member | Imre Farkas | 2018-06-15 | 1 | -1/+8 |
| | |||||
* | Deny repository disk access in development and test | Jacob Vosmaer (GitLab) | 2018-06-14 | 1 | -1/+5 |
| | |||||
* | Merge branch ↵ | Sean McGivern | 2018-06-14 | 1 | -0/+4 |
|\ | | | | | | | | | | | | | | | | | 'rd-33733-showing-created-date-instead-of-updated-date-in-project-lists' into 'master' Invalidate cache with project details when repository is updated Closes #33733 See merge request gitlab-org/gitlab-ce!19774 | ||||
| * | Invalidate cache with project details when repository is updatedrd-33733-showing-created-date-instead-of-updated-date-in-project-lists | Rubén Dávila | 2018-06-13 | 1 | -0/+4 |
| | | | | | | | | | | The partial using this cache key was showing stale information due to the cache not being invalidated. | ||||
* | | enable CommonMark as the default | Brett Walker | 2018-06-14 | 1 | -1/+1 |
| | | |||||
* | | [Rails5] Fix `storage_counter` helper | blackst0ne | 2018-06-13 | 1 | -10/+14 |
| | | | | | | | | | | | | | | | | Since rails 5 beta 2 support of petabytes and exabytes were added to the `number_to_human*` methods. See https://github.com/rails/rails/pull/22759 So for rails5 the comma separator gets shown for big numbers (EBs). | ||||
* | | Merge branch 'rs-update-rspec' into 'master' | Rémy Coutable | 2018-06-11 | 2 | -7/+5 |
|\ \ | |/ |/| | | | | | Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449 | ||||
| * | Correct more usages of non-relative `fixture_file_upload` paths | Robert Speicher | 2018-06-07 | 2 | -7/+5 |
| | | |||||
* | | Merge branch 'feature/customizable-favicon' into 'master' | Douwe Maan | 2018-06-07 | 1 | -17/+0 |
|\ \ | |/ |/| | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497 | ||||
| * | extract favicon logic to lib class | Alexis Reigel | 2018-06-05 | 1 | -22/+0 |
| | | |||||
| * | use custom main favicon | Alexis Reigel | 2018-06-05 | 1 | -0/+5 |
| | | |||||
* | | Restore navigation theme order | George Tsiolis | 2018-06-07 | 1 | -1/+1 |
| | | |||||
* | | Resolve "Introduce new navigation themes in GitLab 11.0" | Annabel Gray | 2018-06-07 | 1 | -3/+3 |
| | | |||||
* | | Fix invisible rows on importer status | Stan Hu | 2018-06-06 | 1 | -3/+3 |
|/ | |||||
* | Resolve "Add Xcode Button in UI" | André Luís | 2018-06-05 | 1 | -0/+42 |
| | |||||
* | Export assigned issues in iCalendar feed | Imre Farkas | 2018-05-31 | 2 | -4/+24 |
| | |||||
* | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-05-23 | 1 | -2/+8 |
|\ | |||||
| * | Resolve "Web IDE doesn't work for branches with slashes" | Tim Zallmann | 2018-05-23 | 1 | -2/+8 |
| | | |||||
* | | Merge branch 'master' into 'bootstrap4' | Clement Ho | 2018-05-10 | 1 | -1/+1 |
|\ \ | |/ | | | | | # Conflicts: # app/views/shared/runners/_form.html.haml | ||||
| * | Adjust spec to build correct path when storage path ends in slash | Douwe Maan | 2018-05-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-05-08 | 2 | -0/+49 |
|\ \ | |/ | |||||
| * | Merge branch '4084-epics-username-autocomplete-ce' into 'master' | Douwe Maan | 2018-05-07 | 1 | -0/+12 |
| |\ | | | | | | | | | | | | | Backport CE changes from "autocomplete usernames in Epic comments/description" See merge request gitlab-org/gitlab-ce!18605 | ||||
| | * | Backport of 4084-epics-username-autocomplete | Mario de la Ossa | 2018-05-04 | 1 | -0/+12 |
| | | | |||||
| * | | Allow a user to accept/decline terms | Bob Van Landuyt | 2018-05-04 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | When a user accepts, we store this in the agreements to keep track of which terms they accepted. We also update the flag on the user. | ||||
| * | | Make the user dropdown reusable | Bob Van Landuyt | 2018-05-04 | 1 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | | We will reuse the the dropdown, but exclude some menu items based on permissions. So moving the menu to a partial, and adding checks for each menu item here. | ||||
* | | | Merge branch 'master' into 'bootstrap4' | Clement Ho | 2018-05-01 | 3 | -140/+162 |
|\ \ \ | |/ / | | | | | | | # Conflicts: # app/views/projects/branches/_branch.html.haml | ||||
| * | | Merge branch 'dm-commit-trailer-without-gravatar' into 'master' | Robert Speicher | 2018-05-01 | 2 | -140/+138 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit trailer rendering when Gravatar is disabled Closes #45633 See merge request gitlab-org/gitlab-ce!18586 | ||||
| | * | | Fix commit trailer rendering when Gravatar is disabled | Douwe Maan | 2018-04-25 | 2 | -140/+138 |
| | | | | |||||
| * | | | Exclude LDAP from OmniauthCallbackController base methods | James Edwards-Jones | 2018-04-30 | 1 | -0/+24 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-04-26 | 1 | -0/+25 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Nick Thomas | 2018-04-26 | 1 | -3/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'ide-relative-url-fix' of gitlab.com:gitlab-org/gitlab-ce | Nick Thomas | 2018-04-26 | 1 | -0/+25 |
| |\ \ \ | |||||
| | * | | | fixed rubocop | Phil Hughes | 2018-04-25 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | restore original script_name config | Phil Hughes | 2018-04-25 | 1 | -0/+11 |
| | | | | | |||||
| | * | | | added helper spec | Phil Hughes | 2018-04-25 | 1 | -0/+14 |
| | | |/ | | |/| | |||||
* | | | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-04-25 | 2 | -3/+18 |
|\ \ \ \ | | |_|/ | |/| | |